database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merge with 5.1

Browse Source
This commit is contained in:
Sergei Golubchik
2010-09-11 20:43:48 +02:00
parent ec06ba2455 966661c8cc
commit a3d80d952d
448 changed files with 9732 additions and 3460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
tests/mysql_client_test.c
View File

@@ -3326,7 +3326,7 @@ static void test_long_data_str()
DIE_UNLESS(rc == 1);
mysql_free_result(result);
my_sprintf(data, (data, "%d", i*5));
sprintf(data, "%d", i*5);
verify_col_data("test_long_data_str", "LENGTH(longstr)", data);
data[0]= '\0';
while (i--)
@@ -3424,10 +3424,10 @@ static void test_long_data_str1()
DIE_UNLESS(rc == 1);
mysql_free_result(result);
my_sprintf(data, (data, "%ld", (long)i*length));
sprintf(data, "%ld", (long)i*length);
verify_col_data("test_long_data_str", "length(longstr)", data);
my_sprintf(data, (data, "%d", i*2));
sprintf(data, "%d", i*2);
verify_col_data("test_long_data_str", "length(blb)", data);
/* Test length of field->max_length */
@@ -13287,37 +13287,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);
}
@@ -15488,7 +15503,7 @@ static void test_bug17667()
return;
}
enable_general_log(1);
enable_query_logs(1);
for (statement_cursor= statements; statement_cursor->buffer != NULL;
statement_cursor++)
@@ -15568,7 +15583,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");
@@ -17432,7 +17447,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);
@@ -17471,7 +17486,7 @@ static void test_bug28386()
mysql_free_result(result);
restore_general_log();
restore_query_logs();
DBUG_VOID_RETURN;
}
@@ -18140,7 +18155,7 @@ static void test_bug53371()
static void test_bug53907()
{
int rc;
char buf[] = "\x4test\x14../client_test_db/t1";
uchar buf[] = "\x4test\x14../client_test_db/t1";
myheader("test_bug53907");
@@ -18160,7 +18175,7 @@ static void test_bug53907()
rc= mysql_change_user(mysql, "testbug", NULL, "bug53907");
myquery(rc);
rc= simple_command(mysql, COM_TABLE_DUMP, (uchar*) buf, sizeof(buf), 0);
rc= simple_command(mysql, COM_TABLE_DUMP, buf, sizeof(buf), 0);
fprintf(stderr, ">>>>>>>>> %d\n", mysql_errno(mysql));
DIE_UNLESS(mysql_errno(mysql) == 1103); /* ER_WRONG_TABLE_NAME */
@@ -18259,7 +18274,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;
@@ -18274,7 +18289,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);
@@ -18312,6 +18327,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();
}
/*
Read and parse arguments and MySQL options from my.cnf
*/
@@ -18392,7 +18421,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},