small cleanup of rpl.rpl_stop_slave

MariaDB · Aug 23, 2017 · 77c41fa · 77c41fa
1 parent f753480
commit 77c41fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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