diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
| commit | 598cf5aec7c7cf4dbb158c87d80916b6e58e7ae6 (patch) | |
| tree | f4f37b22f4271c44aa03c55abe609a058828bedc /mysql-test/r/variables_debug.result | |
| parent | dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c (diff) | |
| parent | d72a4710aaad2f1e76ac20d50793f13f941ef899 (diff) | |
| download | mariadb-git-598cf5aec7c7cf4dbb158c87d80916b6e58e7ae6.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
conflict Makefile.am
conflict mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
conflict mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
conflict sql/opt_sum.cc
conflict sql/set_var.cc
conflict sql/sql_base.cc
conflict sql/sql_priv.h
conflict sql/sql_show.cc
Diffstat (limited to 'mysql-test/r/variables_debug.result')
| -rw-r--r-- | mysql-test/r/variables_debug.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/variables_debug.result b/mysql-test/r/variables_debug.result index 11cbef7fa5b..a02d285b15b 100644 --- a/mysql-test/r/variables_debug.result +++ b/mysql-test/r/variables_debug.result @@ -1,3 +1,4 @@ +SET @old_debug = @@GLOBAL.debug; set debug= 'T'; select @@debug; @@debug @@ -29,4 +30,5 @@ SET GLOBAL debug=''; SELECT @@global.debug; @@global.debug +SET GLOBAL debug=@old_debug; End of 5.1 tests |