database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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
parent ddeee24b39 93e81ccdc7
commit a79187b8a6
4 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;