diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/r/debug_dbug_func.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/debug_dbug_func.result | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_func.result b/mysql-test/suite/sys_vars/r/debug_dbug_func.result index 064769a562b..a622a4d024c 100644 --- a/mysql-test/suite/sys_vars/r/debug_dbug_func.result +++ b/mysql-test/suite/sys_vars/r/debug_dbug_func.result @@ -51,13 +51,13 @@ End of 5.1 tests SET @old_globaldebug = @@global.debug; SET @old_sessiondebug= @@session.debug; # Test 1 - Bug test case, single connection -SET GLOBAL debug_dbug= '+O,../../log/bug46165.1.trace'; +SET GLOBAL debug_dbug= '+O,MYSQL_TMP_DIR/bug46165.1.trace'; SET SESSION debug_dbug= '-d:-t:-i'; SET GLOBAL debug_dbug= ''; SET SESSION debug_dbug= ''; # Test 2 - Bug test case, two connections # Connection default -SET GLOBAL debug_dbug= '+O,../../log/bug46165.2.trace'; +SET GLOBAL debug_dbug= '+O,MYSQL_TMP_DIR/bug46165.2.trace'; SET SESSION debug_dbug= '-d:-t:-i'; # Connection con1 SET GLOBAL debug_dbug= ''; @@ -68,12 +68,21 @@ SET SESSION debug_dbug= ''; SET GLOBAL debug_dbug= ''; # Test 3 - Active session trace file on disconnect # Connection con1 -SET GLOBAL debug_dbug= '+O,../../log/bug46165.3.trace'; -SET SESSION debug_dbug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,MYSQL_TMP_DIR/bug46165.3.trace'; +SELECT @@global.debug_dbug, @@session.debug_dbug; +@@global.debug_dbug @@session.debug_dbug +O,MYSQL_TMP_DIR/bug46165.3.trace O,MYSQL_TMP_DIR/bug46165.3.trace +SET SESSION debug_dbug= '+T'; +SELECT @@global.debug_dbug, @@session.debug_dbug; +@@global.debug_dbug @@session.debug_dbug +O,MYSQL_TMP_DIR/bug46165.3.trace O,MYSQL_TMP_DIR/bug46165.3.trace:T SET GLOBAL debug_dbug= ''; +SELECT @@global.debug_dbug, @@session.debug_dbug; +@@global.debug_dbug @@session.debug_dbug + O,MYSQL_TMP_DIR/bug46165.3.trace:T # Test 4 - Active session trace file on two connections # Connection default -SET GLOBAL debug_dbug= '+O,../../log/bug46165.4.trace'; +SET GLOBAL debug_dbug= '+O,MYSQL_TMP_DIR/bug46165.4.trace'; SET SESSION debug_dbug= '-d:-t:-i'; # Connection con1 SET SESSION debug_dbug= '-d:-t:-i'; @@ -84,8 +93,8 @@ SET SESSION debug_dbug= ''; # Connection con1 # Connection default # Test 5 - Different trace files -SET SESSION debug_dbug= '+O,../../log/bug46165.5.trace'; -SET SESSION debug_dbug= '+O,../../log/bug46165.6.trace'; +SET SESSION debug_dbug= '+O,MYSQL_TMP_DIR/bug46165.5.trace'; +SET SESSION debug_dbug= '+O,MYSQL_TMP_DIR/bug46165.6.trace'; SET SESSION debug_dbug= '-O'; SET GLOBAL debug_dbug= @old_globaldebug; SET SESSION debug_dbug= @old_sessiondebug; |