diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
| commit | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (patch) | |
| tree | ca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /mysql-test/t/mysql_client_test.test | |
| parent | 932285774ba4ad10c199953d47fc0f688fd12c10 (diff) | |
| parent | 8c4d4cc3a6f1fd9852e11e16926a5e98cca5ee03 (diff) | |
| download | mariadb-git-e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'mysql-test/t/mysql_client_test.test')
| -rw-r--r-- | mysql-test/t/mysql_client_test.test | 2 |
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 c8c1fba04e1..2c19671d11b 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 # @@ -24,3 +25,4 @@ echo ok; --echo SET @@global.general_log= @old_general_log; +SET @@global.slow_query_log= @old_slow_query_log; |