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

Merge from 5.1 to 5.5

This commit is contained in:
Praveenkumar Hulakund
2012-07-26 23:53:45 +05:30
3 changed files with 24 additions and 7 deletions

View File

@ -17609,7 +17609,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");
@ -17674,9 +17675,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;
}