=== modified file '.bzrignore'
--- .bzrignore	2012-12-28 10:37:41 +0000
+++ .bzrignore	2013-04-26 19:01:27 +0000
@@ -40,3 +40,4 @@
 docs/changes/
 docs/latex/
 libdrizzle-config
+test-suite.log

=== modified file 'tests/unit/column.c'
--- tests/unit/column.c	2013-03-19 20:38:59 +0000
+++ tests/unit/column.c	2013-04-26 19:01:27 +0000
@@ -56,13 +56,13 @@
 
   set_up_connection();
   CHECKED_QUERY("SET CHARACTER SET latin1"); /* Or any other one-byte-per-character character set */
-  set_up_schema();
-
-  CHECKED_QUERY("create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)");
-
-  CHECKED_QUERY("insert into libdrizzle.t1 (b) values ('this'),('is'),('war')");
-
-  CHECKED_QUERY("select * from libdrizzle.t1");
+  set_up_schema("test_column");
+
+  CHECKED_QUERY("create table test_column.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)");
+
+  CHECKED_QUERY("insert into test_column.t1 (b) values ('this'),('is'),('war')");
+
+  CHECKED_QUERY("select * from test_column.t1");
 
   drizzle_result_buffer(result);
   num_fields= drizzle_result_column_count(result);
@@ -82,7 +82,7 @@
     while ((column= drizzle_column_next(result)))
     {
       cur_column++;
-      ASSERT_EQ_(strcmp(drizzle_column_db(column), "libdrizzle"), 0, "Column has bad DB name");
+      ASSERT_EQ_(strcmp(drizzle_column_db(column), "test_column"), 0, "Column has bad DB name");
       ASSERT_EQ_(strcmp(drizzle_column_table(column), "t1"), 0, "Column had bad table name");
         switch (cur_column) {
             case 1:
@@ -105,9 +105,9 @@
 
   drizzle_result_free(result);
 
-  CHECKED_QUERY("DROP TABLE libdrizzle.t1");
+  CHECKED_QUERY("DROP TABLE test_column.t1");
 
-  tear_down_schema();
+  tear_down_schema("test_column");
 
   return EXIT_SUCCESS;
 }

=== modified file 'tests/unit/common.c'
--- tests/unit/common.c	2013-04-21 21:56:39 +0000
+++ tests/unit/common.c	2013-04-26 19:01:27 +0000
@@ -73,21 +73,27 @@
   ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "%s(%s)", drizzle_error(con), drizzle_strerror(driz_ret));
 }
 
-void set_up_schema(void)
+void set_up_schema(const char *schema)
 {
   drizzle_result_st VARIABLE_IS_NOT_USED *result;
   drizzle_return_t driz_ret;
-
-  CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle");
-  CHECKED_QUERY("CREATE SCHEMA libdrizzle");
-  CHECK(drizzle_select_db(con, "libdrizzle"));
+  char sch_query[128];
+
+  snprintf(sch_query, 127, "DROP SCHEMA IF EXISTS %s", schema);
+
+  CHECKED_QUERY(sch_query);
+  snprintf(sch_query, 127, "CREATE SCHEMA %s", schema);
+  CHECKED_QUERY(sch_query);
+  CHECK(drizzle_select_db(con, schema));
 }
 
-void tear_down_schema(void)
+void tear_down_schema(const char *schema)
 {
   drizzle_result_st VARIABLE_IS_NOT_USED *result;
   drizzle_return_t driz_ret;
+  char sch_query[128];
 
-  CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle");
+  snprintf(sch_query, 127, "DROP SCHEMA IF EXISTS %s", schema);
+  CHECKED_QUERY(sch_query);
 }
 

=== modified file 'tests/unit/common.h'
--- tests/unit/common.h	2013-04-21 21:41:39 +0000
+++ tests/unit/common.h	2013-04-26 19:01:27 +0000
@@ -61,8 +61,8 @@
 extern void close_connection_on_exit(void);
 
 /* For unit tests that make tables, etc.: delete-and-recreate the schema on setup, and delete the schema on teardown. */
-extern void set_up_schema(void);
-extern void tear_down_schema(void);
+extern void set_up_schema(const char* schema);
+extern void tear_down_schema(const char* schema);
 
 /* Perform a query; assign the result to 'result' and the returncode to 'driz_ret'; assert that the returncode is DRIZZLE_RETURN_OK. */
 #define CHECKED_QUERY(cmd) result = drizzle_query(con, cmd, 0, &driz_ret); \

=== modified file 'tests/unit/datetypes.c'
--- tests/unit/datetypes.c	2013-04-25 10:15:18 +0000
+++ tests/unit/datetypes.c	2013-04-26 19:01:27 +0000
@@ -85,20 +85,22 @@
   unsigned rows_in_table;
   
   set_up_connection();
-  set_up_schema();
-  
-  CHECKED_QUERY("create table libdrizzle.dt1 (a int primary key not null, b date, c year(4), d timestamp(0), e timestamp(6), f time(0), g time(6), h datetime(0), i datetime(6))");
+  set_up_schema("test_datetime");
+ 
+  SKIP_IF_(drizzle_server_version_number(con) < 50604, "Test requires MySQL 5.6.4 or higher");
+ 
+  CHECKED_QUERY("create table test_datetime.dt1 (a int primary key not null, b date, c year(4), d timestamp(0), e timestamp(6), f time(0), g time(6), h datetime(0), i datetime(6))");
   rows_in_table = 0;
   
   /* Insert rows with pk 1 and 2 */
-  CHECKED_QUERY("insert into libdrizzle.dt1 (a,b,c,d,e,f,g,h,i) values "
+  CHECKED_QUERY("insert into test_datetime.dt1 (a,b,c,d,e,f,g,h,i) values "
                 "(1, '1970-01-01', '2112', '2013-03-13 09:22:00.001', '2013-03-13 09:22:00.001', '6:15:03', '23:59:59.75', '1642-12-25 12:15:01', '1642-12-25 12:12:00.125'),"
                 "(2, '84-02-29', '12', NOW(), NOW(), '3 6:15:03', '23:59:59.0625', '1642-12-25 12:15:01', '1642-12-25 12:12:00.000000');");
   ASSERT_EQ(drizzle_result_affected_rows(result), 2);
   rows_in_table += 2;
     
   /* Insert row with pk 3 and 4 - test marshaling values we transmit */
-  query = "insert into libdrizzle.dt1 (a,b,c,d,e,f,g,h,i) values (?,?,?,?,?,?,?,?,?)";
+  query = "insert into test_datetime.dt1 (a,b,c,d,e,f,g,h,i) values (?,?,?,?,?,?,?,?,?)";
   sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query);
   
@@ -139,7 +141,7 @@
   CHECK(drizzle_stmt_close(sth));
 
   /* Read the table back, with values sent over the wire in text form */
-  CHECKED_QUERY("select * from libdrizzle.dt1 order by a");
+  CHECKED_QUERY("select * from test_datetime.dt1 order by a");
   
   drizzle_result_buffer(result);
   num_fields= drizzle_result_column_count(result);
@@ -163,7 +165,7 @@
     while ((column= drizzle_column_next(result)))
     {
       cur_column++;
-      ASSERT_EQ_(strcmp(drizzle_column_db(column), "libdrizzle"), 0, "Column has bad DB name");
+      ASSERT_EQ_(strcmp(drizzle_column_db(column), "test_datetime"), 0, "Column has bad DB name");
       ASSERT_EQ_(strcmp(drizzle_column_table(column), "dt1"), 0, "Column %d had bad table name", cur_column);
       ASSERT_EQ(drizzle_column_current(result), cur_column);
       ASSERT_STREQ_(drizzle_column_name(column), column_names[cur_column], "Column %d name", cur_column);
@@ -200,7 +202,7 @@
   drizzle_result_free(result);
 
   /* Read the table back, with values sent over the wire in binary form */
-  query = "select a,b,c,d,e,f,g,h,i from libdrizzle.dt1 order by a";
+  query = "select a,b,c,d,e,f,g,h,i from test_datetime.dt1 order by a";
   sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query);
   driz_ret = drizzle_stmt_execute(sth);
@@ -279,7 +281,7 @@
     const char *col_name = column_names[checking_column];
     char query_buf[128];
     int VARIABLE_IS_NOT_USED unused;
-    unused = snprintf(query_buf, 128, "select a, %s, cast(%s as char) from libdrizzle.dt1",
+    unused = snprintf(query_buf, 128, "select a, %s, cast(%s as char) from test_datetime.dt1",
 	     col_name, col_name);
     query = query_buf;
 
@@ -323,9 +325,9 @@
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s", drizzle_strerror(driz_ret), drizzle_error(con));
   }
   
-  CHECKED_QUERY("DROP TABLE libdrizzle.dt1");
+  CHECKED_QUERY("DROP TABLE test_datetime.dt1");
   
-  tear_down_schema();
+  tear_down_schema("test_datetime");
     
   return EXIT_SUCCESS;
 }

=== modified file 'tests/unit/insert_id.c'
--- tests/unit/insert_id.c	2013-03-04 22:11:55 +0000
+++ tests/unit/insert_id.c	2013-04-26 19:01:27 +0000
@@ -68,31 +68,31 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
-  CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle");
-
-  CHECKED_QUERY("CREATE SCHEMA libdrizzle");
-
-  ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
-
-  CHECKED_QUERY("create table libdrizzle.t1 (a int primary key auto_increment, b int)");
-
-  drizzle_result_st *result= drizzle_query(con, "insert into libdrizzle.t1 (b) values (1),(2),(3)", 0, &ret);
+  CHECKED_QUERY("DROP SCHEMA IF EXISTS test_insert");
+
+  CHECKED_QUERY("CREATE SCHEMA test_insert");
+
+  ret= drizzle_select_db(con, "test_insert");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_insert");
+
+  CHECKED_QUERY("create table test_insert.t1 (a int primary key auto_increment, b int)");
+
+  drizzle_result_st *result= drizzle_query(con, "insert into test_insert.t1 (b) values (1),(2),(3)", 0, &ret);
   ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values (1),(2),(3): %s", drizzle_error(con));
   ASSERT_TRUE(result);
 
   ASSERT_EQ_(drizzle_result_insert_id(result), 1, "Got bad insert_id (expected 1, got %"PRIu64")", drizzle_result_insert_id(result));
   drizzle_result_free(result);
 
-  result= drizzle_query(con, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)", 0, &ret);
-  ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6): %s", drizzle_error(con));
+  result= drizzle_query(con, "INSERT INTO test_insert.t1 (b) VALUES (4),(5),(6)", 0, &ret);
+  ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "INSERT INTO test_insert.t1 (b) VALUES (4),(5),(6): %s", drizzle_error(con));
 
   ASSERT_EQ_(drizzle_result_insert_id(result), 4, "Got bad insert_id (expected 4, got %"PRIu64")", drizzle_result_insert_id(result));
   drizzle_result_free(result);
 
-  CHECKED_QUERY("DROP TABLE libdrizzle.t1");
+  CHECKED_QUERY("DROP TABLE test_insert.t1");
 
-  CHECKED_QUERY("DROP SCHEMA libdrizzle");
+  CHECKED_QUERY("DROP SCHEMA test_insert");
 
   ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));

=== modified file 'tests/unit/nulls.c'
--- tests/unit/nulls.c	2013-04-22 19:14:35 +0000
+++ tests/unit/nulls.c	2013-04-26 19:01:27 +0000
@@ -85,19 +85,19 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(driz_ret));
   
-  CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle");
-  
-  CHECKED_QUERY("CREATE SCHEMA libdrizzle");
-  
-  driz_ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "USE libdrizzle");
-  
-  CHECKED_QUERY("create table libdrizzle.t1 (a int, b int, c int, d int, e int, f int, g int, h int, i int, j int, k int)");
+  CHECKED_QUERY("DROP SCHEMA IF EXISTS test_nulls");
+  
+  CHECKED_QUERY("CREATE SCHEMA test_nulls");
+  
+  driz_ret= drizzle_select_db(con, "test_nulls");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "USE test_nulls");
+  
+  CHECKED_QUERY("create table test_nulls.t1 (a int, b int, c int, d int, e int, f int, g int, h int, i int, j int, k int)");
   
 #define NCOLS 11
   
   char *querybuf = calloc(256 + 60*64, 1);
-  strcpy(querybuf, "insert into libdrizzle.t1 values ");
+  strcpy(querybuf, "insert into test_nulls.t1 values ");
   char *p = querybuf + strlen(querybuf);
   
   for(int sym = 0; sym < 64; sym++) {
@@ -121,7 +121,7 @@
   CHECKED_QUERY(querybuf);
   
 #ifdef TEST_PREPARED_STATEMENTS
-  strcpy(querybuf, "insert into libdrizzle.t1 values (?,?,?,?,?,?,?,?,?,?,?)");
+  strcpy(querybuf, "insert into test_nulls.t1 values (?,?,?,?,?,?,?,?,?,?,?)");
   sth = drizzle_stmt_prepare(con, querybuf, strlen(querybuf), &driz_ret);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), querybuf);
   
@@ -161,7 +161,7 @@
   table_size = 64;
 #endif
   
-  CHECKED_QUERY("select a,b,c,d,e,f,g,h,i,j,k from libdrizzle.t1 order by e");
+  CHECKED_QUERY("select a,b,c,d,e,f,g,h,i,j,k from test_nulls.t1 order by e");
   drizzle_result_buffer(result);
   num_fields= drizzle_result_column_count(result);
   ASSERT_EQ_(num_fields, NCOLS, "Bad number of fields, expected %d, got %d", 11, num_fields);
@@ -208,7 +208,7 @@
   drizzle_result_free(result);
   
 #ifdef TEST_PREPARED_STATEMENTS
-  strcpy(querybuf, "select a,b,c,d,e,f,g,h,i,j,k from libdrizzle.t1 order by e");
+  strcpy(querybuf, "select a,b,c,d,e,f,g,h,i,j,k from test_nulls.t1 order by e");
   sth = drizzle_stmt_prepare(con, querybuf, strlen(querybuf), &driz_ret);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), querybuf);
   driz_ret = drizzle_stmt_execute(sth);
@@ -266,10 +266,10 @@
   ASSERT_EQ(drizzle_stmt_close(sth), DRIZZLE_RETURN_OK);
 #endif
   
-  CHECKED_QUERY("DROP TABLE libdrizzle.t1");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE libdrizzle.t1");
+  CHECKED_QUERY("DROP TABLE test_nulls.t1");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE test_nulls.t1");
    
-  CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle");
+  CHECKED_QUERY("DROP SCHEMA IF EXISTS test_nulls");
 
   driz_ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "%s", drizzle_strerror(driz_ret));

=== modified file 'tests/unit/numbers.c'
--- tests/unit/numbers.c	2013-04-21 21:41:39 +0000
+++ tests/unit/numbers.c	2013-04-26 19:01:27 +0000
@@ -89,20 +89,20 @@
   int num_fields;
   
   set_up_connection();
-  set_up_schema();
+  set_up_schema("test_numbers");
   
-  CHECKED_QUERY("create table libdrizzle.t1 (a int primary key auto_increment, b tinyint, c smallint, d mediumint, e int, f bigint, g float, h double)");
+  CHECKED_QUERY("create table test_numbers.t1 (a int primary key auto_increment, b tinyint, c smallint, d mediumint, e int, f bigint, g float, h double)");
   
   /* Insert rows with pk 1 and 2 */
-  CHECKED_QUERY("insert into libdrizzle.t1 (b,c,d,e,f,g,h) values (1,1,1,1,1,1,1), (127,32687,8388351,2147352575,9222246136947920895,443664,291.2711110711098);");
+  CHECKED_QUERY("insert into test_numbers.t1 (b,c,d,e,f,g,h) values (1,1,1,1,1,1,1), (127,32687,8388351,2147352575,9222246136947920895,443664,291.2711110711098);");
   ASSERT_EQ(drizzle_result_affected_rows(result), 2);
   
   /* Insert row with pk 3 */
-  CHECKED_QUERY("insert into libdrizzle.t1 (b,c,d,e,f,g,h) ( select 0-b, 0-c, 0-d, 0-e, 0-f, g+1.015625, h+1 from t1 where a = 2 );");
+  CHECKED_QUERY("insert into test_numbers.t1 (b,c,d,e,f,g,h) ( select 0-b, 0-c, 0-d, 0-e, 0-f, g+1.015625, h+1 from t1 where a = 2 );");
   ASSERT_EQ(drizzle_result_affected_rows(result), 1);
   
   /* Insert row with pk 4 - test marshaling values we transmit */
-  query = "insert into libdrizzle.t1 (b,c,d,e,f,g,h) values (?,?,?,?,?,?,?)";
+  query = "insert into test_numbers.t1 (b,c,d,e,f,g,h) values (?,?,?,?,?,?,?)";
   sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query);
   CHECK(drizzle_stmt_set_tiny(sth,   0, 127, 0));
@@ -121,7 +121,7 @@
   /* TODO: Also send some negative values of each type */
   
   /* Read the table back, with values sent over the wire in text form */
-  CHECKED_QUERY("select * from libdrizzle.t1 order by b, a");
+  CHECKED_QUERY("select * from test_numbers.t1 order by b, a");
   
   drizzle_result_buffer(result);
   num_fields= drizzle_result_column_count(result);
@@ -147,7 +147,7 @@
     while ((column= drizzle_column_next(result)))
     {
       cur_column++;
-      ASSERT_EQ_(strcmp(drizzle_column_db(column), "libdrizzle"), 0, "Column has bad DB name");
+      ASSERT_EQ_(strcmp(drizzle_column_db(column), "test_numbers"), 0, "Column has bad DB name");
       ASSERT_EQ_(strcmp(drizzle_column_table(column), "t1"), 0, "Column had bad table name");
       ASSERT_EQ(drizzle_column_current(result), cur_column);
       ASSERT_STREQ(drizzle_column_name(column), column_names[cur_column]);
@@ -187,7 +187,7 @@
   drizzle_result_free(result);
   
   /* Read the table back, with values sent over the wire in binary form */
-  query = "select a,b,c,d,e,f,g,h from libdrizzle.t1";
+  query = "select a,b,c,d,e,f,g,h from test_numbers.t1";
   sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query);
   driz_ret = drizzle_stmt_execute(sth);
@@ -317,10 +317,10 @@
   driz_ret = drizzle_stmt_close(sth);
   ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s", drizzle_strerror(driz_ret), drizzle_error(con));
   
-  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &driz_ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE libdrizzle.t1");
+  drizzle_query(con, "DROP TABLE test_numbers.t1", 0, &driz_ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE test_numbers.t1");
   
-  tear_down_schema();
+  tear_down_schema("test_numbers");
   
   return EXIT_SUCCESS;
 }

=== modified file 'tests/unit/query.c'
--- tests/unit/query.c	2013-03-04 22:11:55 +0000
+++ tests/unit/query.c	2013-04-26 19:01:27 +0000
@@ -68,28 +68,28 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle");
-
-  CHECKED_QUERY("CREATE SCHEMA libdrizzle");
-
-  ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
-
-  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
+  CHECKED_QUERY("DROP SCHEMA IF EXISTS test_query");
+
+  CHECKED_QUERY("CREATE SCHEMA test_query");
+
+  ret= drizzle_select_db(con, "test_query");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_query");
+
+  drizzle_query(con, "create table test_query.t1 (a int)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Create table failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
+  drizzle_query(con, "insert into test_query.t1 values (1),(2),(3)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Insert failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from test_query.t1", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Select failure\n");
@@ -124,11 +124,11 @@
 
   drizzle_result_free(result);
 
-  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
+  drizzle_query(con, "DROP TABLE test_query.t1", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_query.t1");
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_query", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_query (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));

=== modified file 'tests/unit/row.c'
--- tests/unit/row.c	2013-01-27 09:48:19 +0000
+++ tests/unit/row.c	2013-04-26 19:01:27 +0000
@@ -66,30 +66,30 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
-
-  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_row", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_row (%s)", drizzle_error(con));
+
+  drizzle_query(con, "CREATE SCHEMA test_row", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_row (%s)", drizzle_error(con));
+
+  ret= drizzle_select_db(con, "test_row");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_row");
+
+  drizzle_query(con, "create table test_row.t1 (a int)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Create table failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
+  drizzle_query(con, "insert into test_row.t1 values (1),(2),(3)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Insert failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from test_row.t1", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Select failure\n");
@@ -148,11 +148,11 @@
 
   drizzle_result_free(result);
 
-  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
+  drizzle_query(con, "DROP TABLE test_row.t1", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_row.t1");
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_row", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_row (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));

=== modified file 'tests/unit/statement.c'
--- tests/unit/statement.c	2013-02-27 19:08:06 +0000
+++ tests/unit/statement.c	2013-04-26 19:01:27 +0000
@@ -70,22 +70,22 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
-
-  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con));
-
-  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt (%s)", drizzle_error(con));
+
+  drizzle_query(con, "CREATE SCHEMA test_stmt", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt (%s)", drizzle_error(con));
+
+  ret= drizzle_select_db(con, "test_stmt");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_stmt");
+
+  drizzle_query(con, "create table test_stmt.t1 (a int)", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table test_stmt.t1 (a int): %s", drizzle_error(con));
+
+  drizzle_query(con, "insert into test_stmt.t1 values (1),(2),(3)", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
-  const char *query= "select * from libdrizzle.t1 where a > ?";
+  const char *query= "select * from test_stmt.t1 where a > ?";
   stmt= drizzle_stmt_prepare(con, query, strlen(query), &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
@@ -146,11 +146,11 @@
   ret = drizzle_stmt_close(stmt);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
-  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
+  drizzle_query(con, "DROP TABLE test_stmt.t1", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_stmt.t1");
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_stmt (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));

=== modified file 'tests/unit/statement_char.c'
--- tests/unit/statement_char.c	2013-01-27 09:48:19 +0000
+++ tests/unit/statement_char.c	2013-04-26 19:01:27 +0000
@@ -70,22 +70,22 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
-
-  drizzle_query(con, "create table libdrizzle.t1 (a varchar(50))", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con));
-
-  drizzle_query(con, "insert into libdrizzle.t1 values ('hello'),('drizzle'),('people')", 0, &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt_ch", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt_ch (%s)", drizzle_error(con));
+
+  drizzle_query(con, "CREATE SCHEMA test_stmt_ch", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt_ch (%s)", drizzle_error(con));
+
+  ret= drizzle_select_db(con, "test_stmt_ch");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_stmt_ch");
+
+  drizzle_query(con, "create table test_stmt_ch.t1 (a varchar(50))", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table test_stmt_ch.t1 (a int): %s", drizzle_error(con));
+
+  drizzle_query(con, "insert into test_stmt_ch.t1 values ('hello'),('drizzle'),('people')", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
-  const char *query= "select * from libdrizzle.t1 where a = ?";
+  const char *query= "select * from test_stmt_ch.t1 where a = ?";
   stmt= drizzle_stmt_prepare(con, query, strlen(query), &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
@@ -141,11 +141,11 @@
   ret = drizzle_stmt_close(stmt);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_stmt_close() %s", drizzle_error(con));
 
-  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
+  drizzle_query(con, "DROP TABLE test_stmt_ch.t1", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_stmt_ch.t1");
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt_ch", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_stmt_ch (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));

=== modified file 'tests/unit/unbuffered_query.c'
--- tests/unit/unbuffered_query.c	2013-01-27 09:48:19 +0000
+++ tests/unit/unbuffered_query.c	2013-04-26 19:01:27 +0000
@@ -66,30 +66,30 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
-
-  ret= drizzle_select_db(con, "libdrizzle");
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
-
-  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_unbuff", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_unbuff (%s)", drizzle_error(con));
+
+  drizzle_query(con, "CREATE SCHEMA test_unbuff", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_unbuff (%s)", drizzle_error(con));
+
+  ret= drizzle_select_db(con, "test_unbuff");
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_unbuff");
+
+  drizzle_query(con, "create table test_unbuff.t1 (a int)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Create table failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
+  drizzle_query(con, "insert into test_unbuff.t1 values (1),(2),(3)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Insert failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from test_unbuff.t1", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Select failure\n");
@@ -142,11 +142,11 @@
 
   drizzle_result_free(result);
 
-  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
+  drizzle_query(con, "DROP TABLE test_unbuff.t1", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_unbuff.t1");
 
-  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
+  drizzle_query(con, "DROP SCHEMA IF EXISTS test_unbuff", 0, &ret);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_unbuff (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));