mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse source
This commit is contained in:
Davi Arnaut 2010-07-30 09:43:42 -03:00
commit a79187b8a6
4 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/mysql_client_test.result
View file

@ -1,4 +1,5 @@
SET @old_general_log= @@global.general_log;
SET @old_slow_query_log= @@global.slow_query_log;
ok
# cat MYSQL_TMP_DIR/test_wl4435.out.log
@ -120,3 +121,4 @@ mysql_stmt_next_result(): 0; field_count: 0
# ------------------------------------
SET @@global.general_log= @old_general_log;
SET @@global.slow_query_log= @old_slow_query_log;

2
mysql-test/t/mysql_client_test.test
View file

@ -2,6 +2,7 @@
-- source include/not_embedded.inc
SET @old_general_log= @@global.general_log;
SET @old_slow_query_log= @@global.slow_query_log;
# We run with different binaries for normal and --embedded-server
#
@ -24,3 +25,4 @@ echo ok;
--echo
SET @@global.general_log= @old_general_log;
SET @@global.slow_query_log= @old_slow_query_log;

4
sql/sql_prepare.cc
View file

@ -882,7 +882,7 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array,
type (the types are supplied at execute). Check that the
supplied type of placeholder can accept a data stream.
*/
else if (!is_param_long_data_type(param))
else if (! is_param_long_data_type(param))
DBUG_RETURN(1);
res= param->query_val_str(&str);
if (param->convert_str_value(thd))
@ -928,7 +928,7 @@ static bool insert_params(Prepared_statement *stmt, uchar *null_array,
type (the types are supplied at execute). Check that the
supplied type of placeholder can accept a data stream.
*/
else if (is_param_long_data_type(param))
else if (! is_param_long_data_type(param))
DBUG_RETURN(1);
if (param->convert_str_value(stmt->thd))
DBUG_RETURN(1); /* out of memory */

49
tests/mysql_client_test.c
View file

@ -13831,37 +13831,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);
}
@ -16031,7 +16046,7 @@ static void test_bug17667()
return;
}
enable_general_log(1);
enable_query_logs(1);
for (statement_cursor= statements; statement_cursor->buffer != NULL;
statement_cursor++)
@ -16111,7 +16126,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");
@ -17974,7 +17989,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);
@ -18013,7 +18028,7 @@ static void test_bug28386()
mysql_free_result(result);
restore_general_log();
restore_query_logs();
DBUG_VOID_RETURN;
}
@ -19064,7 +19079,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;
@ -19079,7 +19094,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);
@ -19117,6 +19132,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.
@ -19306,7 +19335,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},