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/r/variables_debug.result | |
| 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/r/variables_debug.result')
| -rw-r--r-- | mysql-test/r/variables_debug.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/variables_debug.result b/mysql-test/r/variables_debug.result index 85eaf34b033..11cbef7fa5b 100644 --- a/mysql-test/r/variables_debug.result +++ b/mysql-test/r/variables_debug.result @@ -10,6 +10,13 @@ set debug= '-P'; select @@debug; @@debug T +SELECT @@session.debug, @@global.debug; +@@session.debug @@global.debug +T +SET SESSION debug = ''; +SELECT @@session.debug, @@global.debug; +@@session.debug @@global.debug + # # Bug #52629: memory leak from sys_var_thd_dbug in # binlog.binlog_write_error |