diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-30 09:43:42 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-30 09:43:42 -0300 |
| commit | ab20577be5d34daed7ae772285d069af59d09dee (patch) | |
| tree | 0ca35ebb75e23482899b95281ad39e3f7ee6b904 /mysql-test/r/mysql_client_test.result | |
| parent | 6978f450a94fdbe13f340a548a6385130b15c5f9 (diff) | |
| parent | 415fea54c5e6073ec5a40b465ba1d6eeb6032dd1 (diff) | |
| download | mariadb-git-ab20577be5d34daed7ae772285d069af59d09dee.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'mysql-test/r/mysql_client_test.result')
| -rw-r--r-- | mysql-test/r/mysql_client_test.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_client_test.result b/mysql-test/r/mysql_client_test.result index f30c64f6bef..7875464ebe2 100644 --- a/mysql-test/r/mysql_client_test.result +++ b/mysql-test/r/mysql_client_test.result @@ -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; |