diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-23 13:34:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-24 01:05:54 +0200 |
| commit | 77c41fa725120172c9b379169711d15a6a15a814 (patch) | |
| tree | f490359a3b586236e3c3e4419dfed1dec00e418d | |
| parent | f753480c726c5c8137cb2f87cc3bc71e8d535098 (diff) | |
| download | mariadb-git-77c41fa725120172c9b379169711d15a6a15a814.tar.gz | |
small cleanup of rpl.rpl_stop_slave
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_stop_slave.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_stop_slave.test | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result index 2417c5abda8..4b9c544527b 100644 --- a/mysql-test/suite/rpl/r/rpl_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result @@ -15,7 +15,8 @@ include/stop_slave.inc # Suspend the INSERT statement in current transaction on SQL thread. # It guarantees that SQL thread is applying the transaction when # STOP SLAVE command launchs. -SET GLOBAL debug_dbug= '+d,after_mysql_insert,*'; +set @old_debug=@@global.debug; +set global debug_dbug= '+d,after_mysql_insert'; include/start_slave.inc # CREATE TEMPORARY TABLE with InnoDB engine @@ -98,7 +99,8 @@ connection slave; include/stop_slave.inc connection master; include/stop_dump_threads.inc -SET GLOBAL debug_dbug= '+d,dump_thread_wait_before_send_xid,*'; +set @old_debug=@@global.debug; +set global debug_dbug= '+d,dump_thread_wait_before_send_xid'; connection slave; include/start_slave.inc BEGIN; diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index 5071fd348fb..c650991a42b 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -22,8 +22,8 @@ source include/stop_slave.inc; --echo # Suspend the INSERT statement in current transaction on SQL thread. --echo # It guarantees that SQL thread is applying the transaction when --echo # STOP SLAVE command launchs. -let $debug_save= `SELECT @@GLOBAL.debug`; -SET GLOBAL debug_dbug= '+d,after_mysql_insert,*'; +set @old_debug=@@global.debug; +set global debug_dbug= '+d,after_mysql_insert'; source include/start_slave.inc; --echo @@ -45,7 +45,7 @@ source extra/rpl_tests/rpl_stop_slave.test; --echo --echo # Test end --disable_query_log -eval SET GLOBAL debug_dbug= '$debug_save'; +set global debug_dbug= @old_debug; --enable_query_log source include/restart_slave_sql.inc; @@ -79,8 +79,8 @@ connection master; # make sure that there are no zombie threads --source include/stop_dump_threads.inc -let $debug_save= `SELECT @@GLOBAL.debug`; -SET GLOBAL debug_dbug= '+d,dump_thread_wait_before_send_xid,*'; +set @old_debug=@@global.debug; +set global debug_dbug= '+d,dump_thread_wait_before_send_xid'; connection slave; --source include/start_slave.inc @@ -127,7 +127,7 @@ reap; # that would set the dump thread to wait connection master; --disable_query_log -eval SET GLOBAL debug_dbug= '$debug_save'; +set global debug_dbug= @old_debug; --enable_query_log # make sure that there are no zombie threads --source include/stop_dump_threads.inc |