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 of mysql-5.5 into mysql-5.5-wl1054

Browse Source
This commit is contained in:
Georgi Kodinov
2010-09-20 17:17:32 +03:00
parent 702d559fd5 9141bb5878
commit dc0b8f7ada
503 changed files with 25265 additions and 6911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/mysql_client_test.c
View File

@ -13623,37 +13623,52 @@ static void test_bug15518()
}
static void disable_general_log()
static void disable_query_logs()
{
int rc;
rc= mysql_query(mysql, "set @@global.general_log=off");
myquery(rc);
rc= mysql_query(mysql, "set @@global.slow_query_log=off");
myquery(rc);
}
static void enable_general_log(int truncate)
static void enable_query_logs(int truncate)
{
int rc;
rc= mysql_query(mysql, "set @save_global_general_log=@@global.general_log");
myquery(rc);
rc= mysql_query(mysql, "set @save_global_slow_query_log=@@global.slow_query_log");
myquery(rc);
rc= mysql_query(mysql, "set @@global.general_log=on");
myquery(rc);
rc= mysql_query(mysql, "set @@global.slow_query_log=on");
myquery(rc);
if (truncate)
{
rc= mysql_query(mysql, "truncate mysql.general_log");
myquery(rc);
rc= mysql_query(mysql, "truncate mysql.slow_log");
myquery(rc);
}
}
static void restore_general_log()
static void restore_query_logs()
{
int rc;
rc= mysql_query(mysql, "set @@global.general_log=@save_global_general_log");
myquery(rc);
rc= mysql_query(mysql, "set @@global.slow_query_log=@save_global_slow_query_log");
myquery(rc);
}
@ -15823,7 +15838,7 @@ static void test_bug17667()
return;
}
enable_general_log(1);
enable_query_logs(1);
for (statement_cursor= statements; statement_cursor->buffer != NULL;
statement_cursor++)
@ -15903,7 +15918,7 @@ static void test_bug17667()
statement_cursor->buffer);
}
restore_general_log();
restore_query_logs();
if (!opt_silent)
printf("success. All queries found intact in the log.\n");
@ -17766,7 +17781,7 @@ static void test_bug28386()
}
mysql_free_result(result);
enable_general_log(1);
enable_query_logs(1);
stmt= mysql_simple_prepare(mysql, "SELECT ?");
check_stmt(stmt);
@ -17805,7 +17820,7 @@ static void test_bug28386()
mysql_free_result(result);
restore_general_log();
restore_query_logs();
DBUG_VOID_RETURN;
}
@ -18856,7 +18871,7 @@ static void test_bug42373()
Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
*/
static void test_bug54041()
static void test_bug54041_impl()
{
int rc;
MYSQL_STMT *stmt;
@ -18871,7 +18886,7 @@ static void test_bug54041()
rc= mysql_query(mysql, "CREATE TABLE t1 (a INT)");
myquery(rc);
stmt= mysql_simple_prepare(mysql, "INSERT INTO t1 (a) VALUES (?)");
stmt= mysql_simple_prepare(mysql, "SELECT a FROM t1 WHERE a > ?");
check_stmt(stmt);
verify_param_count(stmt, 1);
@ -18909,6 +18924,20 @@ static void test_bug54041()
}
/**
Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
*/
static void test_bug54041()
{
enable_query_logs(0);
test_bug54041_impl();
disable_query_logs();
test_bug54041_impl();
restore_query_logs();
}
/*
Bug#49972: Crash in prepared statements.
@ -19098,7 +19127,7 @@ and you are welcome to modify and redistribute it under the GPL license\n");
static struct my_tests_st my_tests[]= {
{ "disable_general_log", disable_general_log },
{ "disable_query_logs", disable_query_logs },
{ "test_view_sp_list_fields", test_view_sp_list_fields },
{ "client_query", client_query },
{ "test_prepare_insert_update", test_prepare_insert_update},