1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

mysql-5.5.28

This commit is contained in:
Sergei Golubchik
2012-10-16 13:04:42 +02:00
124 changed files with 3353 additions and 713 deletions

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);
}