database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge with 5.5

Browse Source
This commit is contained in:
Sergei Golubchik
2012-11-03 12:28:51 +01:00
parent 247e654fa7 4ffc9c3b01
commit 40e94a3734
210 changed files with 5894 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/mysql_client_test.c
View File

@ -17691,7 +17691,8 @@ static void test_bug43560(void)
const char* values[] = {"eins", "zwei", "drei", "viele", NULL};
const char insert_str[] = "INSERT INTO t1 (c2) VALUES (?)";
unsigned long length;
const unsigned int drop_db= opt_drop_db;
DBUG_ENTER("test_bug43560");
myheader("test_bug43560");
@ -17756,9 +17757,11 @@ static void test_bug43560(void)
rc= mysql_stmt_execute(stmt);
DIE_UNLESS(rc && mysql_stmt_errno(stmt) == CR_SERVER_LOST);
client_disconnect(conn, 0);
opt_drop_db= 0;
client_disconnect(conn);
rc= mysql_query(mysql, "DROP TABLE t1");
myquery(rc);
opt_drop_db= drop_db;
DBUG_VOID_RETURN;
}
@ -18548,7 +18551,7 @@ static void test_progress_reporting()
myquery(rc);
rc= mysql_query(conn, "set @@global.progress_report_time=@save");
myquery(rc);
client_disconnect(conn, 0);
mysql_close(conn);
}