summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql_client_test.test
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-30 09:17:10 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-30 09:17:10 -0300
commita9538cacda199fcfd733a191c17cc68569871cd7 (patch)
treed858af08e9abd0e0ab698c72a2003bd29f6d5774 /mysql-test/t/mysql_client_test.test
parent5e13086bf88eabfbf91dce63332a450ef52f101f (diff)
downloadmariadb-git-a9538cacda199fcfd733a191c17cc68569871cd7.tar.gz
Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
Fix a regression (due to a typo) which caused spurious incorrect argument errors for long data stream parameters if all forms of logging were disabled (binary, general and slow logs). mysql-test/t/mysql_client_test.test: Save the status of the slow_log. sql/sql_prepare.cc: Add a missing logical NOT operator. tests/mysql_client_test.c: Disable all query logs when running C tests. Fixes a omission when, slow log should have been disabled too. Run test case for Bug#54041 with query logs enabled and disabled.
Diffstat (limited to 'mysql-test/t/mysql_client_test.test')
-rw-r--r--mysql-test/t/mysql_client_test.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/t/mysql_client_test.test
index 15c0cd4ac84..41670117c7c 100644
--- a/mysql-test/t/mysql_client_test.test
+++ b/mysql-test/t/mysql_client_test.test
@@ -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
#
@@ -17,3 +18,4 @@ SET @old_general_log= @@global.general_log;
echo ok;
SET @@global.general_log= @old_general_log;
+SET @@global.slow_query_log= @old_slow_query_log;