diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-05-20 16:35:28 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-05-20 16:35:28 +0400 |
commit | dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c (patch) | |
tree | 2b0d3650bb46050bc0438cfd5228e52e89aa3895 /mysql-test/t/variables_debug.test | |
parent | a08c47a3ace44229e8683108bd1ce4a45471b491 (diff) | |
parent | a18861e4adab138553da6b55a7b1d7286acbe23d (diff) | |
download | mariadb-git-dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c.tar.gz |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/r/partition.result
- mysql-test/r/variables_debug.result
- mysql-test/t/partition.test
- mysql-test/t/variables_debug.test
Diffstat (limited to 'mysql-test/t/variables_debug.test')
-rw-r--r-- | mysql-test/t/variables_debug.test | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/t/variables_debug.test b/mysql-test/t/variables_debug.test index 8f2bde7ae42..0d6ee43cd75 100644 --- a/mysql-test/t/variables_debug.test +++ b/mysql-test/t/variables_debug.test @@ -11,6 +11,16 @@ select @@debug; set debug= '-P'; select @@debug; +# +# Bug#38054: "SET SESSION debug" modifies @@global.debug variable +# + +SELECT @@session.debug, @@global.debug; + +SET SESSION debug = ''; + +SELECT @@session.debug, @@global.debug; + --echo # --echo # Bug #52629: memory leak from sys_var_thd_dbug in --echo # binlog.binlog_write_error |