diff options
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/binlog_inject_error.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/check-warnings.test | 2 | ||||
| -rw-r--r-- | mysql-test/include/io_thd_fault_injection.inc | 6 | ||||
| -rw-r--r-- | mysql-test/include/maria_verify_recovery.inc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/include/binlog_inject_error.inc b/mysql-test/include/binlog_inject_error.inc index 6465f7943a4..383f66ba843 100644 --- a/mysql-test/include/binlog_inject_error.inc +++ b/mysql-test/include/binlog_inject_error.inc @@ -14,9 +14,9 @@ # source include/binlog_inject_error.inc; # -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; --echo $query; --replace_regex /(errno: .*)/(errno: #)/ --error ER_ERROR_ON_WRITE --eval $query -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index fab7fb2cff6..3a26f7eecb1 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -14,7 +14,7 @@ set SQL_LOG_BIN=0; # Turn off any debug crashes, allow the variable to be # non existent in release builds --error 0,1193 -set debug=""; +set debug_dbug=""; use mtr; diff --git a/mysql-test/include/io_thd_fault_injection.inc b/mysql-test/include/io_thd_fault_injection.inc index 7cbe055dbf6..11479b3a66c 100644 --- a/mysql-test/include/io_thd_fault_injection.inc +++ b/mysql-test/include/io_thd_fault_injection.inc @@ -8,13 +8,13 @@ SET @old_debug=@@global.debug; -- disable_warnings -- source include/stop_slave.inc -- enable_warnings --- eval SET GLOBAL debug="+d,$io_thd_injection_fault_flag" +-- eval SET GLOBAL debug_dbug="+d,$io_thd_injection_fault_flag" START SLAVE io_thread; -- source include/wait_for_slave_io_error.inc --- eval SET GLOBAL debug="-d,$io_thd_injection_fault_flag" -SET GLOBAL debug=@old_debug; +-- eval SET GLOBAL debug_dbug="-d,$io_thd_injection_fault_flag" +SET GLOBAL debug_dbug=@old_debug; # restart because slave is in bad shape --let $rpl_server_number= 2 diff --git a/mysql-test/include/maria_verify_recovery.inc b/mysql-test/include/maria_verify_recovery.inc index 71292947c80..9b56061b2b4 100644 --- a/mysql-test/include/maria_verify_recovery.inc +++ b/mysql-test/include/maria_verify_recovery.inc @@ -32,7 +32,7 @@ system echo wait-maria_verify_recovery.inc >> $MYSQLTEST_VARDIR/tmp/mysqld.1.exp # but that would implicitely commit all work, which the tester may # not want (tester may want to observe rollback happening). -eval SET SESSION debug=$mvr_debug_option; +eval SET SESSION debug_dbug=$mvr_debug_option; --echo * crashing mysqld intentionally --error 2013 eval $mvr_crash_statement; # this will crash (DBUG magic) |