MDEV-21360 global debug_dbug pre-test value restoration issues

22 files changed, 49 insertions, 49 deletions

diff --git a/mysql-test/suite/rpl/r/kill_race_condition.result b/mysql-test/suite/rpl/r/kill_race_condition.result
index 4da61a78eb9..8e8645cdb58 100644
--- a/mysql-test/suite/rpl/r/kill_race_condition.result
+++ b/mysql-test/suite/rpl/r/kill_race_condition.result
@@ -4,7 +4,7 @@ connection master;
 create table t1 (a int);
 connection slave;
 connection slave;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug='d,rows_log_event_before_open_table';
 connection master;
 insert t1 values (1),(2),(3);
@@ -14,7 +14,7 @@ kill slave_sql_thread;
 set debug_sync='now SIGNAL go_ahead_sql';
 include/wait_for_slave_sql_error.inc [errno=1927]
 Last_SQL_Error = Error executing row event: 'Connection was killed'
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 set debug_sync='RESET';
 connection master;
 drop table t1;
diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result
index a3d60a672a9..bdf2c707e9b 100644
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result
@@ -5,11 +5,11 @@ call mtr.add_suppression("Failed during slave I/O thread initialization");
 call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* 1593");
 include/stop_slave.inc
 reset slave;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
 start slave;
 include/wait_for_slave_sql_error.inc [errno=1593]
 Last_SQL_Error = 'Failed during slave thread initialization'
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 RESET SLAVE;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_bug41902.result b/mysql-test/suite/rpl/r/rpl_bug41902.result
index de594d39a98..7d676ea73e3 100644
--- a/mysql-test/suite/rpl/r/rpl_bug41902.result
+++ b/mysql-test/suite/rpl/r/rpl_bug41902.result
@@ -2,7 +2,7 @@ include/master-slave.inc
 [connection master]
 connection slave;
 stop slave;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET @@debug_dbug="d,simulate_find_log_pos_error";
 reset slave;
 ERROR HY000: Target log not found in binlog index
@@ -20,7 +20,7 @@ SET @@debug_dbug="";
 reset slave;
 change master to master_host='dummy';
 connection master;
-set @saved_dbug_m = @@global.debug_dbug;
+SET @saved_dbug_m = @@global.debug_dbug;
 SET @@debug_dbug="d,simulate_find_log_pos_error";
 reset master;
 ERROR HY000: Target log not found in binlog index
@@ -31,7 +31,7 @@ purge binary logs to 'master-bin.000001';
 ERROR HY000: Target log not found in binlog index
 SET @@debug_dbug="";
 purge binary logs to 'master-bin.000001';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 ==== clean up ====
 CHANGE MASTER TO MASTER_HOST = '127.0.0.1';
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_checksum.result b/mysql-test/suite/rpl/r/rpl_checksum.result
index 7a8644f6bea..21d8ca22feb 100644
--- a/mysql-test/suite/rpl/r/rpl_checksum.result
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result
@@ -93,7 +93,7 @@ set @save_dbug = @@session.debug_dbug;
 set @@session.debug_dbug='d,simulate_checksum_test_failure';
 show binlog events;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
-set debug_dbug= @save_dbug;
+SET debug_dbug= @save_dbug;
 set @@global.master_verify_checksum = default;
 connection slave;
 connection slave;
diff --git a/mysql-test/suite/rpl/r/rpl_row_big_table_id.result b/mysql-test/suite/rpl/r/rpl_row_big_table_id.result
index 8d22289370b..9a7a97e3d00 100644
--- a/mysql-test/suite/rpl/r/rpl_row_big_table_id.result
+++ b/mysql-test/suite/rpl/r/rpl_row_big_table_id.result
@@ -2,7 +2,7 @@ include/master-slave.inc
 [connection master]
 connection master;
 include/rpl_restart_server.inc [server_number=1]
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET @@debug_dbug="d,simulate_big_table_id";
 CREATE TABLE t (a int);
 INSERT INTO t SET a= 0;
@@ -43,6 +43,6 @@ master-bin.000002	#	Query	1	#	COMMIT
 connection slave;
 connection master;
 DROP TABLE t;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 connection slave;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_row_find_row_debug.result b/mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
index 118266399fb..650f6eeee51 100644
--- a/mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
+++ b/mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
@@ -2,7 +2,7 @@ include/master-slave.inc
 [connection master]
 connection slave;
 include/stop_slave.inc
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL log_warnings = 2;
 SET GLOBAL debug_dbug="d,inject_long_find_row_note";
 include/start_slave.inc
@@ -18,7 +18,7 @@ connection slave;
 # Check if any note related to long DELETE_ROWS and UPDATE_ROWS appears in the error log
 Occurrences: update=1, delete=1
 include/stop_slave.inc
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 SET GLOBAL log_warnings = 2;
 include/start_slave.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_skip_repl.result b/mysql-test/suite/rpl/r/rpl_semi_sync_skip_repl.result
index 62d4ea896ef..d517d53c6da 100644
--- a/mysql-test/suite/rpl/r/rpl_semi_sync_skip_repl.result
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_skip_repl.result
@@ -11,7 +11,7 @@ SET @@GLOBAL.rpl_semi_sync_slave_enabled = 1;
 include/start_slave.inc
 connection master;
 CREATE TABLE t1 (a INT) ENGINE=innodb;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET @@GLOBAL.debug_dbug="d,dbug_master_binlog_over_2GB";
 SET @@SESSION.skip_replication=1;
 INSERT INTO t1 SET a=1;
@@ -21,7 +21,7 @@ SET @@GLOBAL.debug_dbug="";
 FLUSH LOGS;
 connection slave;
 connection master;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 SET @@GLOBAL.rpl_semi_sync_master_timeout = 10000;
 SET @@GLOBAL.rpl_semi_sync_master_enabled = 0;
 connection master;
diff --git a/mysql-test/suite/rpl/r/rpl_show_slave_running.result b/mysql-test/suite/rpl/r/rpl_show_slave_running.result
index a668b8b26f3..353ff379776 100644
--- a/mysql-test/suite/rpl/r/rpl_show_slave_running.result
+++ b/mysql-test/suite/rpl/r/rpl_show_slave_running.result
@@ -3,7 +3,7 @@ include/master-slave.inc
 connection slave;
 SET DEBUG_SYNC= 'RESET';
 include/stop_slave.inc
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= 'd,dbug.before_get_running_status_yes';
 Slave_running, Slave_IO_Running, Slave_SQL_Running, must be OFF, NO, NO in three following queries
 SHOW STATUS LIKE 'Slave_running';
@@ -35,7 +35,7 @@ Slave_running	ON
 Slave_IO_Running= Yes
 Slave_SQL_Running= Yes
 connection slave;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 SET DEBUG_SYNC= 'RESET';
 End of tests
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result
index e5ef1224033..597df34c302 100644
--- a/mysql-test/suite/rpl/r/rpl_stop_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result
@@ -15,7 +15,7 @@ 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 @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug= '+d,after_mysql_insert,*';
 include/start_slave.inc
 
@@ -75,7 +75,7 @@ connection master;
 connection slave;
 
 # Test end
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 include/restart_slave.inc
 connection slave;
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
@@ -100,7 +100,7 @@ connection slave;
 include/stop_slave.inc
 connection master;
 include/stop_dump_threads.inc
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug= '+d,dump_thread_wait_before_send_xid,*';
 connection slave;
 include/start_slave.inc
@@ -123,7 +123,7 @@ connection slave;
 include/wait_for_slave_to_stop.inc
 connection slave1;
 connection master;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 include/stop_dump_threads.inc
 connection slave1;
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_view_debug.result b/mysql-test/suite/rpl/r/rpl_view_debug.result
index 1f2f7f2ab15..e23f33c035f 100644
--- a/mysql-test/suite/rpl/r/rpl_view_debug.result
+++ b/mysql-test/suite/rpl/r/rpl_view_debug.result
@@ -21,7 +21,7 @@ Tables_in_test
 t1
 v1
 connection master;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set @@debug_dbug="d,simulate_register_view_failure";
 CREATE VIEW v2 as SELECT * FROM t1;
 ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
@@ -37,5 +37,5 @@ v1
 connection master;
 DROP VIEW IF EXISTS v1;
 DROP TABLE t1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/kill_race_condition.test b/mysql-test/suite/rpl/t/kill_race_condition.test
index 79e1270b13c..25a7b18bac2 100644
--- a/mysql-test/suite/rpl/t/kill_race_condition.test
+++ b/mysql-test/suite/rpl/t/kill_race_condition.test
@@ -7,7 +7,7 @@ create table t1 (a int);
 --sync_slave_with_master
 
 connection slave;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug='d,rows_log_event_before_open_table';
 
 connection master;
@@ -23,7 +23,7 @@ set debug_sync='now SIGNAL go_ahead_sql';
 --source include/wait_for_slave_sql_error.inc
 let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
 --echo Last_SQL_Error = $error
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 set debug_sync='RESET';
 connection master;
 drop table t1;
diff --git a/mysql-test/suite/rpl/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test
index c5e88fd68bf..0b2cbb6365c 100644
--- a/mysql-test/suite/rpl/t/rpl_bug33931.test
+++ b/mysql-test/suite/rpl/t/rpl_bug33931.test
@@ -15,7 +15,7 @@ call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.*
 reset slave;
 
 # Set debug flags on slave to force errors to occur
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
 
 --disable_query_log
@@ -40,7 +40,7 @@ start slave;
 #
 # Cleanup
 #
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 
 # Clear Last_SQL_Error
 RESET SLAVE;
diff --git a/mysql-test/suite/rpl/t/rpl_bug41902.test b/mysql-test/suite/rpl/t/rpl_bug41902.test
index 21a556b9c8e..bb6c572580f 100644
--- a/mysql-test/suite/rpl/t/rpl_bug41902.test
+++ b/mysql-test/suite/rpl/t/rpl_bug41902.test
@@ -15,7 +15,7 @@ source include/master-slave.inc;
 
 connection slave;
 stop slave;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET @@debug_dbug="d,simulate_find_log_pos_error";
 
 --error ER_UNKNOWN_TARGET_BINLOG
@@ -36,7 +36,7 @@ reset slave;
 change master to master_host='dummy';
 
 connection master;
-set @saved_dbug_m = @@global.debug_dbug;
+SET @saved_dbug_m = @@global.debug_dbug;
 SET @@debug_dbug="d,simulate_find_log_pos_error";
 --error ER_UNKNOWN_TARGET_BINLOG
 reset master;
@@ -59,7 +59,7 @@ connection slave;
 call mtr.add_suppression("Failed to locate old binlog or relay log files");
 call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ..master-bin.000001 not listed in the index");
 --enable_query_log
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 
 --echo ==== clean up ====
 CHANGE MASTER TO MASTER_HOST = '127.0.0.1';
diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
index ac625e0b21a..a61c06a92e5 100644
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
@@ -26,7 +26,7 @@ call mtr.add_suppression("Fatal error: The slave I/O thread stops because master
 call mtr.add_suppression("Slave I/O thread .* register on master");
 
 #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 
 # set up two parameters to pass into extra/rpl_tests/rpl_get_master_version_and_clock
 let $dbug_sync_point= 'debug_lock.before_get_UNIX_TIMESTAMP';
@@ -42,7 +42,7 @@ source extra/rpl_tests/rpl_get_master_version_and_clock.test;
 
 
 # cleanup
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 # is not really necessary but avoids mtr post-run env check warnings
 SET DEBUG_SYNC= 'RESET';
 
diff --git a/mysql-test/suite/rpl/t/rpl_row_big_table_id.test b/mysql-test/suite/rpl/t/rpl_row_big_table_id.test
index 07e5aee4560..abf22cc876e 100644
--- a/mysql-test/suite/rpl/t/rpl_row_big_table_id.test
+++ b/mysql-test/suite/rpl/t/rpl_row_big_table_id.test
@@ -17,7 +17,7 @@
 --let $rpl_server_number= 1
 --source include/rpl_restart_server.inc
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET @@debug_dbug="d,simulate_big_table_id";
 CREATE TABLE t (a int);
 
@@ -52,7 +52,7 @@ if (`SELECT sum(a) != 6 FROM t`)
 
 --connection master
 DROP TABLE t;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 --sync_slave_with_master
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
index 41a107e217d..2753fd1f9e0 100644
--- a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
+++ b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
@@ -9,7 +9,7 @@
 # - setup log_warnings and debug 
 --connection slave
 --source include/stop_slave.inc
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 --let $log_warnings_save= `SELECT @@GLOBAL.log_warnings`
 
 SET GLOBAL log_warnings = 2;
@@ -55,7 +55,7 @@ EOF
 
 # cleanup
 --source include/stop_slave.inc
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 --eval SET GLOBAL log_warnings = $log_warnings_save
 --source include/start_slave.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_row_index_choice.test b/mysql-test/suite/rpl/t/rpl_row_index_choice.test
index 89b14add3b0..958fa2352c2 100644
--- a/mysql-test/suite/rpl/t/rpl_row_index_choice.test
+++ b/mysql-test/suite/rpl/t/rpl_row_index_choice.test
@@ -47,7 +47,7 @@ sync_slave_with_master;
 connection slave;
 ANALYZE TABLE t2;
 --echo # Slave will crash if using the wrong or no index
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan";
 
 connection master;
@@ -239,5 +239,5 @@ connection master;
 DROP TABLE t1;
 sync_slave_with_master;
 connection slave;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_skip_repl.test b/mysql-test/suite/rpl/t/rpl_semi_sync_skip_repl.test
index 2558792b438..0d2739e1937 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_skip_repl.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_skip_repl.test
@@ -33,7 +33,7 @@ source include/start_slave.inc;
 CREATE TABLE t1 (a INT) ENGINE=innodb;
 
 # Make the following events as if they offset over 2GB from the beginning of binlog
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET @@GLOBAL.debug_dbug="d,dbug_master_binlog_over_2GB";
 SET @@SESSION.skip_replication=1;
 INSERT INTO t1 SET a=1;
@@ -51,7 +51,7 @@ FLUSH LOGS;
 # Clean up
 #
 --connection master
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 --eval SET @@GLOBAL.rpl_semi_sync_master_timeout = $sav_timeout_master
 --eval SET @@GLOBAL.rpl_semi_sync_master_enabled = $sav_enabled_master
 
diff --git a/mysql-test/suite/rpl/t/rpl_show_slave_running.test b/mysql-test/suite/rpl/t/rpl_show_slave_running.test
index 33151bb87a4..cb4a8819a5b 100644
--- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test
+++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test
@@ -11,7 +11,7 @@ connection slave;
 
 SET DEBUG_SYNC= 'RESET';
 source include/stop_slave.inc;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO
 
 # Test 1. Slave is stopped
@@ -77,7 +77,7 @@ echo Slave_SQL_Running= $status;
 
 connection slave;
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 SET DEBUG_SYNC= 'RESET';
 --echo End of tests
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
index 554ff564a0d..100514089d5 100644
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
@@ -29,7 +29,7 @@
 ##########################################################################
 
 connection slave;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET @@global.debug_dbug= '+d,remove_slave_load_file_before_write';
 
 connection master;
@@ -74,7 +74,7 @@ call mtr.add_suppression("Slave: File.* not found.*");
 call mtr.add_suppression("Slave SQL: Error .File.* not found.* error.* 29");
 --let $rpl_only_running_threads= 1
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 
 --source include/rpl_end.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test
index c1130f1955e..afe36334f18 100644
--- a/mysql-test/suite/rpl/t/rpl_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test
@@ -22,7 +22,7 @@ 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.
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug= '+d,after_mysql_insert,*';
 source include/start_slave.inc;
 
@@ -44,7 +44,7 @@ source extra/rpl_tests/rpl_stop_slave.test;
 
 --echo
 --echo # Test end
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 source include/restart_slave_sql.inc;
 
 connection slave;
@@ -77,7 +77,7 @@ connection master;
 # make sure that there are no zombie threads
 --source include/stop_dump_threads.inc
 
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug= '+d,dump_thread_wait_before_send_xid,*';
 
 connection slave;
@@ -124,7 +124,7 @@ reap;
 # sure that we disable the DBUG_EXECUTE_IF
 # that would set the dump thread to wait
 connection master;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 # make sure that there are no zombie threads
 --source include/stop_dump_threads.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_view_debug.test b/mysql-test/suite/rpl/t/rpl_view_debug.test
index ef59d25bf45..0803692496e 100644
--- a/mysql-test/suite/rpl/t/rpl_view_debug.test
+++ b/mysql-test/suite/rpl/t/rpl_view_debug.test
@@ -18,7 +18,7 @@ sync_slave_with_master;
 # view already has to be on slave
 show tables;
 connection master;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set @@debug_dbug="d,simulate_register_view_failure";
 
 --error ER_OUT_OF_RESOURCES
@@ -31,5 +31,5 @@ show tables;
 connection master;
 DROP VIEW IF EXISTS v1;
 DROP TABLE t1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 --source include/rpl_end.inc