MDEV-21360 global debug_dbug pre-test value restoration issues

mysql-test/extra/binlog_tests/binlog_ioerr.inc

@@ -15,7 +15,7 @@ RESET MASTER;
 
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t1 VALUES(0);
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug='+d,fail_binlog_write_1';
 --error ER_ERROR_ON_WRITE
 INSERT INTO t1 VALUES(1);

mysql-test/extra/rpl_tests/rpl_checksum.inc

@@ -133,7 +133,7 @@ set @save_dbug = @@session.debug_dbug;
 set @@session.debug_dbug='d,simulate_checksum_test_failure';
 --error ER_ERROR_WHEN_EXECUTING_COMMAND
 show binlog events;
-set debug_dbug= @save_dbug;
+SET debug_dbug= @save_dbug;
 set @@global.master_verify_checksum = default;
 
 #connection master;

mysql-test/r/create_or_replace2.result

@@ -4,9 +4,9 @@ drop table if exists t1;
 SET @old_debug= @@session.debug;
 CREATE TABLE t1 (i INT, KEY(i)) ENGINE=InnoDB;
 CREATE OR REPLACE TEMPORARY TABLE tmp (a int, b int, key(a)) engine=myisam;
-set debug_dbug='+d,send_kill_after_delete';
+SET debug_dbug='+d,send_kill_after_delete';
 CREATE OR REPLACE TABLE t1 LIKE tmp;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 SHOW TABLES;
 Tables_in_test
 t1

mysql-test/r/drop_bad_db_type.result

@@ -1,5 +1,5 @@
 SET @saved_dbug = @@debug_dbug;
-set debug_dbug='+d,unstable_db_type';
+SET debug_dbug='+d,unstable_db_type';
 install soname 'ha_archive';
 create table t1 (a int) engine=archive;
 insert t1 values (1),(2),(3);
@@ -33,4 +33,4 @@ t1.frm
 drop table t1;
 db.opt
 uninstall soname 'ha_archive';
-set debug_dbug=@saved_dbug;
+SET debug_dbug=@saved_dbug;

mysql-test/r/engine_error_in_alter-8453.result

@@ -1,7 +1,7 @@
 create table t1 (a int, b int);
-set @saved_dbug = @@session.debug_dbug;
-set debug_dbug='+d,external_lock_failure';
+SET @saved_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='+d,external_lock_failure';
 alter table t1 add column c int;
 ERROR HY000: Got error 168 'KABOOM!' from MyISAM
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 drop table t1;

mysql-test/r/error_simulation.result

@@ -10,7 +10,7 @@ INSERT INTO t1 VALUES
 ('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'),
 ('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK');
 set tmp_table_size=1024;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,raise_error";
 SELECT MAX(a) FROM t1 GROUP BY a,b;
 ERROR 23000: Can't write; duplicate key in table '(temporary)'
@@ -23,7 +23,7 @@ CREATE TABLE t1 (a INT(100) NOT NULL);
 INSERT INTO t1 VALUES (1), (0), (2);
 SET SESSION debug_dbug='+d,alter_table_only_index_change';
 ALTER TABLE t1 ADD INDEX a(a);
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -43,7 +43,7 @@ CREATE TABLE t1(a BLOB);
 SET SESSION debug_dbug="+d,bug42064_simulate_oom";
 INSERT INTO t1 VALUES("");
 Got one of the listed errors
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 DROP TABLE t1;
 #
 # Bug#41660: Sort-index_merge for non-first join table may require 
@@ -80,7 +80,7 @@ a	a	b	filler
 7	1	1	data
 8	1	1	data
 9	1	1	data
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 SET optimizer_switch=@save_optimizer_switch;
 DROP TABLE t1, t2;
 #
@@ -93,7 +93,7 @@ INSERT INTO t2 VALUES (1),(2);
 SET SESSION debug_dbug="+d,bug11747970_raise_error";
 INSERT IGNORE INTO t2 SELECT f1 FROM t1 a WHERE NOT EXISTS (SELECT 1 FROM t2 b WHERE a.f1 = b.f1);
 ERROR 70100: Query execution was interrupted
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 DROP TABLE t1,t2;
 #
 # End of 5.1 tests
@@ -127,4 +127,4 @@ SET SESSION debug_dbug="+d,simulate_create_virtual_tmp_table_out_of_memory";
 SELECT f1(1);
 Got one of the listed errors
 DROP FUNCTION f1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/r/mdev6830.result

@@ -1,4 +1,4 @@
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set @@debug_dbug= 'd,opt';
 CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=MyISAM;
 CREATE TABLE t2 (
@@ -47,4 +47,4 @@ SELECT * FROM t1, v3, t4 WHERE v3.f1 = t4.f1 AND t4.f2 = 6 AND t1.pk = v3.f5;
 pk	f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12	f13	f14	f15	f1	f2
 drop table t1,t2,t3,t4;
 drop view v2,v3;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/r/myisam_debug.result

@@ -34,10 +34,10 @@ create table t1 (a int, index(a));
 lock tables t1 write;
 insert t1 values (1),(2),(1);
 set @old_dbug=@@debug_dbug;
-set debug_dbug='+d,mi_lock_database_failure';
+SET debug_dbug='+d,mi_lock_database_failure';
 unlock tables;
 Warnings:
 Error	126	Index for table './test/t1.MYI' is corrupt; try to repair it
 Error	1030	Got error 22 "Invalid argument" from storage engine MyISAM
-set debug_dbug=@old_dbug;
+SET debug_dbug=@old_dbug;
 drop table t1;

mysql-test/r/range_innodb.result

@@ -70,7 +70,7 @@ key(a),key(b),key(c)
 insert into t1
 select A.a+10*B.a, A.a+10*B.a, A.a+10*B.a+100*C.a
 from t0 A, t0 B, t0 C, t0 D where D.a<5;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set @@global.debug_dbug="+d,ha_index_init_fail";
 explain select * from t1 where a=10 and b=10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -78,5 +78,5 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 select * from t1 where a=10 and b=10;
 ERROR HY000: Table definition has changed, please retry transaction
 DROP TABLE t0,t1;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 set @@optimizer_switch= @optimizer_switch_save;

mysql-test/r/range_interrupted-13751.result

@@ -7,10 +7,10 @@ INSERT INTO t1 (c) SELECT c FROM t1;
 INSERT INTO t1 (c) SELECT c FROM t1;
 INSERT INTO t1 (c) SELECT c FROM t1;
 set @old_dbug=@@session.debug_dbug;
-set debug_dbug="+d,kill_join_init_read_record";
+SET debug_dbug="+d,kill_join_init_read_record";
 SELECT 1 FROM t1 AS alias1, t1 AS alias2, t1 AS alias3
 WHERE alias1.c = alias2.c OR alias1.i <= 1
 ;
 ERROR 70100: Query execution was interrupted
-set debug_dbug=@old_dbug;
+SET debug_dbug=@old_dbug;
 DROP TABLE t1;

mysql-test/r/select_debug.result

@@ -6,7 +6,7 @@ insert into t1 values (2,2), (1,1);
 create table t2 (a int);
 insert into t2 values (2), (3);
 set session join_cache_level=3;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set @@debug_dbug= 'd,opt';
 explain select t1.b from t1,t2 where t1.b=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -17,4 +17,4 @@ b
 2
 set session join_cache_level=default;
 drop table t1,t2;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/r/show_explain.result

@@ -23,7 +23,7 @@ show explain for $thr1;
 ERROR HY000: Target is not running an EXPLAINable command
 connection con1;
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select count(*) from t1 where a < 100000;
 connection default;
 show explain for $thr2;
@@ -58,10 +58,10 @@ connection con1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	a	a	5	NULL	10	Using index condition; Rowid-ordered scan
 set optimizer_switch= @show_expl_tmp;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # UNION, first branch 
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 explain select a from t0 A union select a+1 from t0 B;
 connection default;
 show explain for $thr2;
@@ -76,10 +76,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	A	ALL	NULL	NULL	NULL	NULL	10	
 2	UNION	B	ALL	NULL	NULL	NULL	NULL	10	
 NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # UNION, second branch
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 explain select a from t0 A union select a+1 from t0 B;
 connection default;
 show explain for $thr2;
@@ -94,10 +94,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	A	ALL	NULL	NULL	NULL	NULL	10	
 2	UNION	B	ALL	NULL	NULL	NULL	NULL	10	
 NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # Uncorrelated  subquery, select
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select a, (select max(a) from t0 B) from t0 A where a<1;
 connection default;
 show explain for $thr2;
@@ -109,10 +109,10 @@ Note	1003	select a, (select max(a) from t0 B) from t0 A where a<1
 connection con1;
 a	(select max(a) from t0 B)
 0	9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # Uncorrelated  subquery, explain
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 explain select a, (select max(a) from t0 B) from t0 A where a<1;
 connection default;
 show explain for $thr2;
@@ -125,10 +125,10 @@ connection con1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	A	ALL	NULL	NULL	NULL	NULL	10	Using where
 2	SUBQUERY	B	ALL	NULL	NULL	NULL	NULL	10	
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # correlated  subquery, select
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<1;
 connection default;
 show explain for $thr2;
@@ -140,10 +140,10 @@ Note	1003	select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a
 connection con1;
 a	(select max(a) from t0 b where b.a+a.a<10)
 0	9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # correlated  subquery, explain
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<1;
 connection default;
 show explain for $thr2;
@@ -155,10 +155,10 @@ Note	1003	select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a
 connection con1;
 a	(select max(a) from t0 b where b.a+a.a<10)
 0	9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # correlated  subquery, select, while inside the subquery
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<1;
 connection default;
 show explain for $thr2;
@@ -170,10 +170,10 @@ Note	1003	select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a
 connection con1;
 a	(select max(a) from t0 b where b.a+a.a<10)
 0	9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # correlated  subquery, explain, while inside the subquery
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<1;
 connection default;
 show explain for $thr2;
@@ -185,10 +185,10 @@ Note	1003	select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a
 connection con1;
 a	(select max(a) from t0 b where b.a+a.a<10)
 0	9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # correlated  subquery, explain, while inside the subquery
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a<1;
 connection default;
 show explain for $thr2;
@@ -200,12 +200,12 @@ Note	1003	select a, (select max(a) from t0 b where b.a+a.a<10) from t0 a where a
 connection con1;
 a	(select max(a) from t0 b where b.a+a.a<10)
 0	9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 # Try to do SHOW EXPLAIN for a query that runs a  SET command:
 #   I've found experimentally that select_id==2 here...
 # 
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 set @foo= (select max(a) from t0 where sin(a) >0);
 connection default;
 show explain for $thr2;
@@ -213,13 +213,13 @@ ERROR HY000: Target is not running an EXPLAINable command
 kill query $thr2;
 connection con1;
 ERROR 70100: Query execution was interrupted
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # Attempt SHOW EXPLAIN for an UPDATE
 #
 create table t2 as select a as a, a as dummy from t0 limit 2;
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 update t2 set dummy=0 where (select max(a) from t0 where t2.a + t0.a <3) >3 ;
 connection default;
 show explain for $thr2;
@@ -236,13 +236,13 @@ Warnings:
 Note	1003	update t2 set dummy=0 where (select max(a) from t0 where t2.a + t0.a <3) >3
 connection con1;
 drop table t2;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # Attempt SHOW EXPLAIN for a DELETE (UPD: now works)
 # 
 create table t2 as select a as a, a as dummy from t0 limit 2;
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 delete from t2 where (select max(a) from t0 where t2.a + t0.a <3) >3 ;
 connection default;
 show explain for $thr2;
@@ -259,13 +259,13 @@ Warnings:
 Note	1003	delete from t2 where (select max(a) from t0 where t2.a + t0.a <3) >3
 connection con1;
 drop table t2;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # Multiple SHOW EXPLAIN calls for one select 
 # 
 create table t2 as select a as a, a as dummy from t0 limit 3;
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select t2.a, ((select max(a) from t0 where t2.a + t0.a <3) >3) as SUBQ from t2;
 connection default;
 show explain for $thr2;
@@ -292,14 +292,14 @@ a	SUBQ
 1	0
 2	0
 drop table t2;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # SHOW EXPLAIN for SELECT ... ORDER BY with "Using filesort"
 #
 explain select * from t0 order by a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	10	Using filesort
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 set @show_explain_probe_select_id=1;
 select * from t0 order by a;
 connection default;
@@ -320,7 +320,7 @@ a
 7
 8
 9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # SHOW EXPLAIN for SELECT ... with "Using temporary"
 #
@@ -329,7 +329,7 @@ explain select distinct a from t0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	10	Using temporary
 connection con1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 set @show_explain_probe_select_id=1;
 select distinct a from t0;
 connection default;
@@ -350,7 +350,7 @@ a
 7
 8
 9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # SHOW EXPLAIN for SELECT ... with "Using temporary; Using filesort"
 #
@@ -359,7 +359,7 @@ explain select distinct a from t0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	10	Using temporary
 connection con1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 set @show_explain_probe_select_id=1;
 select distinct a from t0;
 connection default;
@@ -380,7 +380,7 @@ a
 7
 8
 9
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # MDEV-238: SHOW EXPLAIN: Server crashes in JOIN::print_explain with FROM subquery and GROUP BY
 #
@@ -390,7 +390,7 @@ explain SELECT alias.a FROM t2, ( SELECT * FROM t2 ) AS alias GROUP BY alias.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	Using temporary; Using filesort
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	Using join buffer (flat, BNL join)
-set debug_dbug='+d,show_explain_in_find_all_keys';
+SET debug_dbug='+d,show_explain_in_find_all_keys';
 SELECT alias.a FROM t2, ( SELECT * FROM t2 ) AS alias GROUP BY alias.a;
 connection default;
 # FIXED by "conservative assumptions about when QEP is available" fix:
@@ -406,7 +406,7 @@ a
 1
 2
 4
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t2;
 #
 # MDEV-239: Assertion `field_types == 0 ... ' failed in Protocol_text::store(double, uint32, String*) with 
@@ -421,7 +421,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1003	select `test`.`t2`.`a` AS `a` from `test`.`t2` join `test`.`t2` group by `test`.`t2`.`a`
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 EXPLAIN EXTENDED SELECT alias.a FROM t2, ( SELECT * FROM t2 ) AS alias GROUP BY alias.a ;
 connection default;
 show explain for $thr2;
@@ -436,7 +436,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	Using join buffer (flat, BNL join)
 Warnings:
 Note	1003	select `test`.`t2`.`a` AS `a` from `test`.`t2` join `test`.`t2` group by `test`.`t2`.`a`
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t2;
 #
 # MDEV-240: SHOW EXPLAIN: Assertion `this->optimized == 2' failed in 
@@ -453,7 +453,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	6	
 2	DERIVED	t3	system	NULL	NULL	NULL	NULL	1	
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 SELECT * FROM v1, t2;
 connection default;
 show explain for $thr2;
@@ -461,14 +461,14 @@ ERROR HY000: Target is not running an EXPLAINable command
 kill query $thr2;
 connection con1;
 ERROR 70100: Query execution was interrupted
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP VIEW v1;
 DROP TABLE t2, t3;
 #
 # MDEV-267: SHOW EXPLAIN: Server crashes in JOIN::print_explain on most of queries
 #
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 select sleep(1);
 connection default;
 show explain for $thr2;
@@ -479,12 +479,12 @@ Note	1003	select sleep(1)
 connection con1;
 sleep(1)
 0
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # Same as above, but try another reason for JOIN to be degenerate
 #
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 select * from t0 where 1>10;
 connection default;
 show explain for $thr2;
@@ -494,14 +494,14 @@ Warnings:
 Note	1003	select * from t0 where 1>10
 connection con1;
 a
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # Same as above, but try another reason for JOIN to be degenerate (2)
 #
 create table t3(a int primary key);
 insert into t3 select a from t0;
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 select * from t0,t3 where t3.a=112233;
 connection default;
 show explain for $thr2;
@@ -511,7 +511,7 @@ Warnings:
 Note	1003	select * from t0,t3 where t3.a=112233
 connection con1;
 a	a
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t3;
 #
 # MDEV-270: SHOW EXPLAIN: server crashes in JOIN::print_explain on a query with 
@@ -530,7 +530,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 2	SUBQUERY	t2	const	PRIMARY	PRIMARY	4	const	1	
 3	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_do_select';
+SET debug_dbug='+d,show_explain_probe_do_select';
 SELECT * FROM t2 WHERE a = 
 (SELECT MAX(a) FROM t2 
 WHERE pk= (SELECT MAX(pk) FROM t2 WHERE pk = 3)
@@ -552,7 +552,7 @@ pk	a
 6	7
 7	7
 9	7
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t2;
 #
 # MDEV-273: SHOW EXPLAIN: server crashes in JOIN::print_explain on a query with impossible WHERE
@@ -584,7 +584,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	87	Using join buffer (flat, BNL join)
 2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_do_select';
+SET debug_dbug='+d,show_explain_probe_do_select';
 SELECT count(*) FROM t2, t3
 WHERE a1 < ALL ( 
 SELECT a1 FROM t2
@@ -605,7 +605,7 @@ WHERE a1 IN ( SELECT a1 FROM t2, t4 )
 connection con1;
 count(*)
 1740
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t2, t3, t4;
 #
 # MDEV-275: SHOW EXPLAIN: server crashes in JOIN::print_explain with IN subquery and aggregate function
@@ -615,7 +615,7 @@ INSERT INTO t2 VALUES
 (1,5),(2,4),(3,6),(4,9),(5,2),(6,8),(7,4),(8,8),(9,0),(10,43),
 (11,23),(12,3),(13,45),(14,16),(15,2),(16,33),(17,2),(18,5),(19,9),(20,2);
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_end';
+SET debug_dbug='+d,show_explain_probe_join_exec_end';
 SELECT * FROM t2 WHERE (5, 78) IN (SELECT `a1`, MAX(`a1`) FROM t2 GROUP BY `a1`);
 connection default;
 show explain for $thr2;
@@ -627,7 +627,7 @@ Warnings:
 Note	1003	SELECT * FROM t2 WHERE (5, 78) IN (SELECT `a1`, MAX(`a1`) FROM t2 GROUP BY `a1`)
 connection con1;
 pk	a1
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t2;
 DROP TABLE t1;
 #
@@ -636,7 +636,7 @@ DROP TABLE t1;
 CREATE TABLE t1(a INT, KEY(a));
 INSERT INTO t1 VALUES (3),(1),(5),(1);
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT 'test' FROM t1 WHERE a=1;
 connection default;
 show explain for $thr2;
@@ -648,7 +648,7 @@ connection con1;
 test
 test
 test
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1;
 #
 # MDEV-299: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN changes back and forth during query execution
@@ -666,7 +666,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	A	ALL	NULL	NULL	NULL	NULL	100	Using where
 1	SIMPLE	B	ALL	key1	NULL	NULL	NULL	100	Range checked for each record (index map: 0x1)
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_test_if_quick_select';
+SET debug_dbug='+d,show_explain_probe_test_if_quick_select';
 select count(*) from t1 A, t1 B where B.key1 < A.col2 and A.col1=3 AND B.col2 + 1 < 100;
 connection default;
 show explain for $thr2;
@@ -696,7 +696,7 @@ Note	1003	select count(*) from t1 A, t1 B where B.key1 < A.col2 and A.col1=3 AND
 connection con1;
 count(*)
 212
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t1;
 #
 # MDEV-297: SHOW EXPLAIN: Server gets stuck until timeout occurs while
@@ -705,7 +705,7 @@ drop table t1;
 CREATE TABLE t1(a INT, b INT, c INT, KEY(a), KEY(b), KEY(c));
 INSERT INTO t1 (a) VALUES (3),(1),(5),(1);
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SHOW INDEX FROM t1;
 connection default;
 show explain for $thr2;
@@ -718,7 +718,7 @@ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_par
 t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE		
 t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE		
 t1	1	c	1	c	A	NULL	NULL	NULL	YES	BTREE		
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1;
 #
 # MDEV-324: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN for a query with TEMPTABLE view 
@@ -731,7 +731,7 @@ EXPLAIN SELECT a + 1 FROM v1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	
-set debug_dbug='+d,show_explain_probe_join_tab_preread';
+SET debug_dbug='+d,show_explain_probe_join_tab_preread';
 set @show_explain_probe_select_id=1;
 SELECT a + 1 FROM v1;
 connection default;
@@ -745,7 +745,7 @@ connection con1;
 a + 1
 2
 3
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP VIEW v1;
 DROP TABLE t1;
 #
@@ -761,7 +761,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 3	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
-set debug_dbug='+d,show_explain_probe_union_read';
+SET debug_dbug='+d,show_explain_probe_union_read';
 SELECT a FROM t1 WHERE a IN ( SELECT 1+SLEEP(0.01) UNION SELECT 2 );
 connection default;
 show explain for $thr2;
@@ -782,7 +782,7 @@ Warnings:
 Note	1003	SELECT a FROM t1 WHERE a IN ( SELECT 1+SLEEP(0.01) UNION SELECT 2 )
 connection con1;
 a
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1;
 #
 # MDEV-327: SHOW EXPLAIN: Different select_type in plans produced by SHOW EXPLAIN 
@@ -805,7 +805,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 3	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	20	
 3	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	20	Using where
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT * FROM t1, ( SELECT * FROM t2 ) AS alias
 WHERE a < ALL ( SELECT b FROM t1, t2 WHERE a = b );
 connection default;
@@ -820,7 +820,7 @@ Note	1003	SELECT * FROM t1, ( SELECT * FROM t2 ) AS alias
 WHERE a < ALL ( SELECT b FROM t1, t2 WHERE a = b )
 connection con1;
 a	b
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1, t2;
 # 
 #  Test that SHOW EXPLAIN will print 'Distinct'.
@@ -842,7 +842,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	PRIMARY	PRIMARY	4	NULL	4	Using index; Using temporary
 1	SIMPLE	t3	ref	a	a	5	test.t1.a	7	Using index; Distinct
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select distinct t1.a from t1,t3 where t1.a=t3.a;
 connection default;
 show explain for $thr2;
@@ -855,7 +855,7 @@ connection con1;
 a
 1
 2
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t1,t3,t4;
 #
 # ----------  SHOW EXPLAIN and permissions -----------------
@@ -869,7 +869,7 @@ connection con1;
 #  First, make sure that user 'test2' cannot do SHOW EXPLAIN on us
 #
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select * from t0 where a < 3;
 connection default;
 connection con2;
@@ -886,14 +886,14 @@ a
 0
 1
 2
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 #
 # Check that user test2 can do SHOW EXPLAIN on its own queries 
 #
 connect  con3, localhost, test2,,;
 connection con2;
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select * from t0 where a < 3;
 connection con1;
 connection con3;
@@ -916,9 +916,9 @@ disconnect con2;
 grant process on *.* to test2@localhost;
 connect  con2, localhost, test2,,;
 connection con1;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select * from t0 where a < 3;
 connection default;
 connection con2;
@@ -932,7 +932,7 @@ a
 0
 1
 2
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 revoke all privileges on test.* from test2@localhost;
 drop user test2@localhost;
 disconnect con2;
@@ -1009,7 +1009,7 @@ ORDER BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index_merge	a,b	a,b	5,5	NULL	8	Using sort_union(a,b); Using where; Using filesort
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT a+SLEEP(0.01) FROM t1
 WHERE a IN ( 255, 0 ) OR b BETWEEN 6 AND 129
 ORDER BY b;
@@ -1030,9 +1030,9 @@ a+SLEEP(0.01)
 0
 0
 0
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_do_select';
+SET debug_dbug='+d,show_explain_probe_do_select';
 SELECT a+SLEEP(0.01) FROM t1
 WHERE a IN ( 255, 0 ) OR b BETWEEN 6 AND 129
 ORDER BY b;
@@ -1053,7 +1053,7 @@ a+SLEEP(0.01)
 0
 0
 0
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t1;
 # 
 # MDEV-298: SHOW EXPLAIN: Plan returned by SHOW EXPLAIN only contains 
@@ -1067,7 +1067,7 @@ EXPLAIN SELECT a FROM t1 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4112	Using temporary; Using filesort
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT a FROM t1 GROUP BY a;
 connection default;
 show explain for $thr2;
@@ -1093,7 +1093,7 @@ a
 14
 15
 16
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t1;
 #
 # MDEV-408: SHOW EXPLAIN: Some values are chopped off in SHOW EXPLAIN output
@@ -1107,7 +1107,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
 2	DEPENDENT SUBQUERY	t2	index_subquery	PRIMARY,c	c	5	func	1	Using index; Using where
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT SUM(a + SLEEP(0.1)) FROM t1 WHERE a IN ( SELECT c FROM t2 WHERE d < b ) OR b < 's';
 connection default;
 show explain for $thr2;
@@ -1119,7 +1119,7 @@ Note	1003	SELECT SUM(a + SLEEP(0.1)) FROM t1 WHERE a IN ( SELECT c FROM t2 WHERE
 connection con1;
 SUM(a + SLEEP(0.1))
 7862
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 drop table t1, t2;
 #
 # MDEV-412: SHOW EXPLAIN: Server crashes in JOIN::print_explain on a query with inner join and ORDER BY the same column twice
@@ -1157,7 +1157,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	b	b	6	NULL	107	Using where; Using index
 1	SIMPLE	t3	ref	PRIMARY	PRIMARY	5	test.t1.b	1	Using index
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_do_select';
+SET debug_dbug='+d,show_explain_probe_do_select';
 SELECT b AS field1, b AS field2 FROM t1, t2, t3 WHERE d = b ORDER BY field1, field2;
 connection default;
 show explain for $thr2;
@@ -1169,7 +1169,7 @@ Warnings:
 Note	1003	SELECT b AS field1, b AS field2 FROM t1, t2, t3 WHERE d = b ORDER BY field1, field2
 connection con1;
 field1	field2
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1,t2,t3;
 #
 # MDEV-423: SHOW EXPLAIN: 'Using where' for a subquery is shown in EXPLAIN, but not in SHOW EXPLAIN output
@@ -1190,7 +1190,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	20	
 3	SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	20	Using where
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT max(a+b+c) FROM t1 AS alias1, ( SELECT * FROM t2 ) AS alias 
 WHERE EXISTS ( SELECT * FROM t3 WHERE b = c )  OR a <= 10;
 connection default;
@@ -1205,7 +1205,7 @@ WHERE EXISTS ( SELECT * FROM t3 WHERE b = c )  OR a <= 10
 connection con1;
 max(a+b+c)
 279
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1,t2,t3;
 #
 # MDEV-416: Server crashes in SQL_SELECT::cleanup on EXPLAIN with SUM ( DISTINCT ) in a non-correlated subquery (5.5-show-explain tree)
@@ -1231,7 +1231,7 @@ select hex('
 hex('ãû')
 E3FB
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 select * from t0 where length('ãû') = a;
 connection default;
 set names utf8;
@@ -1244,7 +1244,7 @@ set names default;
 connection con1;
 a
 2
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 set names default;
 #
 # MDEV-462: SHOW EXPLAIN: Assertion `table_list->table' fails in find_field_in_table_ref if FOR contains a non-numeric value
@@ -1270,7 +1270,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 3	DEPENDENT SUBQUERY	t1	ALL	a	NULL	NULL	NULL	2	Range checked for each record (index map: 0x1)
 4	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_join_exec_start';
+SET debug_dbug='+d,show_explain_probe_join_exec_start';
 SELECT SUM(b) FROM ( SELECT * FROM t1 ) AS alias1, t2 
 WHERE b <= ANY ( 
 SELECT a FROM t1 
@@ -1290,7 +1290,7 @@ WHERE a = b + SLEEP(0.2) OR a >= ( SELECT SUM(b) FROM t2 ))
 connection con1;
 SUM(b)
 0
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 DROP TABLE t1,t2;
 drop table t0;
 #
@@ -1302,7 +1302,7 @@ create table t1 (a int, b int);
 insert into t1 select a,a from t0;
 create table t2 as select * from t1;
 set @show_explain_probe_select_id=2;
-set debug_dbug='+d,show_explain_probe_best_ext_lim_search';
+SET debug_dbug='+d,show_explain_probe_best_ext_lim_search';
 explain 
 select * from t0 
 where not exists ( select 1 from t1, t2 where t1.b=t2.b and t2.a=t0.a) and a is null;

mysql-test/r/show_explain_non_select.result

@@ -14,7 +14,7 @@ from t0 A, t0 B, t0 C;
 # Test SHOW EXPLAIN for single-table DELETE
 #
 connection con2;
-set debug_dbug='+d,show_explain_probe_delete_exec_start';
+SET debug_dbug='+d,show_explain_probe_delete_exec_start';
 delete from t1 where a<10 and b+1>1000;
 connection default;
 show explain for $thr2;
@@ -27,7 +27,7 @@ connection con2;
 # Test SHOW EXPLAIN for multi-table DELETE
 #
 set @show_explain_probe_select_id=1;
-set debug_dbug='+d,show_explain_probe_do_select';
+SET debug_dbug='+d,show_explain_probe_do_select';
 delete t1 from t1, t0 where t0.a=t1.a and t1.b +1 > 1000;
 connection default;
 show explain for $thr2;
@@ -41,7 +41,7 @@ connection con2;
 # Test SHOW EXPLAIN for single-table UPDATE
 #
 connection con2;
-set debug_dbug='+d,show_explain_probe_update_exec_start';
+SET debug_dbug='+d,show_explain_probe_update_exec_start';
 update t1 set filler='filler-data-2' where a<10 and b+1>1000;
 connection default;
 show explain for $thr2;
@@ -51,5 +51,5 @@ Warnings:
 Note	1003	update t1 set filler='filler-data-2' where a<10 and b+1>1000
 connection con2;
 drop table t0,t1;
-set debug_dbug=@old_debug;
+SET debug_dbug=@old_debug;
 set debug_sync='RESET';

mysql-test/r/show_explain_ps.result

@@ -17,8 +17,8 @@ connection con1;
 connection default;
 connection con1;
 set @show_explain_probe_select_id=1;
-set @saved_dbug = @@session.debug_dbug;
-set debug_dbug='d,show_explain_probe_join_exec_start';
+SET @saved_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='d,show_explain_probe_join_exec_start';
 select count(*) from t0 where a < 100000;
 connection default;
 show explain for $thr2;
@@ -29,7 +29,7 @@ Note	1003	select count(*) from t0 where a < 100000
 connection con1;
 count(*)
 10
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 select event_name
 from
 performance_schema.events_stages_history_long join

mysql-test/r/slowlog_enospace-10508.result

@@ -3,8 +3,8 @@ create table t1 (a int, b int) engine=memory;
 insert t1 select seq, seq+1 from seq_1_to_1000;
 set global general_log=0;
 set global log_queries_not_using_indexes=1;
-set @saved_dbug = @@session.debug_dbug;
-set debug_dbug='+d,simulate_file_write_error';
+SET @saved_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='+d,simulate_file_write_error';
 select * from t1 where a>10;
 select * from t1 where a>10;
 select * from t1 where a>10;
@@ -55,7 +55,7 @@ select * from t1 where a>10;
 select * from t1 where a>10;
 select * from t1 where a>10;
 select * from t1 where a>10;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 set global general_log=1;
 set global log_queries_not_using_indexes=default;
 drop table t1;

mysql-test/r/stat_tables-enospc.result

@@ -1,12 +1,12 @@
 call mtr.add_suppression("No space left on device");
 create table t1 (a varchar(255), b varchar(255), c varchar(255));
 set use_stat_tables=PREFERABLY, optimizer_use_condition_selectivity=3;
-set @saved_dbug = @@session.debug_dbug;
-set debug_dbug='+d,simulate_file_write_error';
+SET @saved_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='+d,simulate_file_write_error';
 set @@max_heap_table_size=128*1024;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	Error	Error writing file 'tmp-file' (Errcode: 28 "No space left on device")
 test.t1	analyze	status	Operation failed
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;
 drop table t1;

mysql-test/r/union_crash-714.result

@@ -1,7 +1,7 @@
 create table t1 (i tinyint);
-set @saved_dbug = @@session.debug_dbug;
-set debug_dbug='+d,bug11747970_raise_error';
+SET @saved_dbug = @@SESSION.debug_dbug;
+SET debug_dbug='+d,bug11747970_raise_error';
 insert into t1 (i) select i from t1 union select i from t1;
 ERROR 70100: Query execution was interrupted
 drop table t1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/r/warnings_debug.result

@@ -1,6 +1,6 @@
 drop table if exists t1;
 create table t1 (a int primary key) engine=innodb;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug="+d,warn_during_ha_commit_trans";
 INSERT INTO t1 VALUES (1);
 Warnings:
@@ -9,4 +9,4 @@ SHOW WARNINGS;
 Level	Code	Message
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 drop table t1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/binlog/r/binlog_ioerr.result

@@ -2,7 +2,7 @@ CALL mtr.add_suppression("Error writing file 'master-bin'");
 RESET MASTER;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t1 VALUES(0);
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug='+d,fail_binlog_write_1';
 INSERT INTO t1 VALUES(1);
 ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device")

mysql-test/suite/binlog_encryption/binlog_ioerr.result

@@ -2,7 +2,7 @@ CALL mtr.add_suppression("Error writing file 'master-bin'");
 RESET MASTER;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t1 VALUES(0);
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug='+d,fail_binlog_write_1';
 INSERT INTO t1 VALUES(1);
 ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device")

mysql-test/suite/binlog_encryption/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;

mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result

@@ -208,7 +208,7 @@ DROP TABLE t1, t2;
 # MDEV-16222 Assertion `0' failed in row_purge_remove_sec_if_poss_leaf
 # on table with virtual columns and indexes
 #
-set @saved_dbug= @@global.debug_dbug;
+SET @saved_dbug= @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,ib_purge_virtual_mdev_16222_1,ib_purge_virtual_mdev_16222_2";
 create table t1 (
 pk serial, vb tinyblob as (b) virtual, b tinyblob,
@@ -253,7 +253,7 @@ SET GLOBAL innodb_debug_sync = "ib_clust_v_col_before_row_allocated "
 SET GLOBAL innodb_debug_sync = "ib_open_after_dict_open "
                                "SIGNAL purge_open "
                                "WAIT_FOR select_open";
-set @saved_dbug= @@global.debug_dbug;
+SET @saved_dbug= @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,ib_purge_virtual_index_callback";
 connect purge_waiter,localhost,root;
 SET debug_sync= "now WAIT_FOR before_row_allocated";

mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test

@@ -265,7 +265,7 @@ DROP TABLE t1, t2;
 --echo #
 
 --let $datadir= `select @@datadir`
-set @saved_dbug= @@global.debug_dbug;
+SET @saved_dbug= @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,ib_purge_virtual_mdev_16222_1,ib_purge_virtual_mdev_16222_2";
 
 create table t1 (
@@ -349,7 +349,7 @@ SET GLOBAL innodb_debug_sync = "ib_open_after_dict_open "
 
 # In 10.2 trx_undo_roll_ptr_is_insert(t_roll_ptr) condition never pass in purge,
 # so this condition is forced to pass in row_vers_old_has_index_entry
-set @saved_dbug= @@global.debug_dbug;
+SET @saved_dbug= @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,ib_purge_virtual_index_callback";
 
 # The purge starts from REPLACE command. To avoid possible race, separate

mysql-test/suite/innodb/r/blob-update-debug.result

@@ -8,10 +8,10 @@ select f1, substring(f2, 1, 40) from t1;
 f1	substring(f2, 1, 40)
 1	****************************************
 set @saved_debug = @@session.debug_dbug;
-set debug_dbug = 'd,row_ins_index_entry_timeout';
+SET debug_dbug = 'd,row_ins_index_entry_timeout';
 update t1 set f1 = 3;
 select f1, substring(f2, 1, 40) from t1;
 f1	substring(f2, 1, 40)
 3	****************************************
 drop table t1;
-set debug_dbug= @saved_debug;
+SET debug_dbug= @saved_debug;

mysql-test/suite/innodb/r/innodb-replace-debug.result

@@ -5,10 +5,10 @@ create table t1 (f1 int primary key, f2 int, f3 int, unique key k1(f2),
 key k2(f3)) engine=innodb;
 insert into t1 values (14, 24, 34);
 set @old_dbug= @@session.debug_dbug;
-set debug_dbug = '+d,row_ins_sec_index_entry_timeout';
+SET debug_dbug = '+d,row_ins_sec_index_entry_timeout';
 replace into t1 values (14, 25, 34);
 select * from t1;
 f1	f2	f3
 14	25	34
 drop table t1;
-set debug_dbug = @old_dbug;
+SET debug_dbug = @old_dbug;

mysql-test/suite/innodb/r/innodb-stats-initialize-failure.result

@@ -1,5 +1,5 @@
 call mtr.add_suppression("InnoDB: Warning: Index.*");
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set DEBUG_DBUG='+d,ib_ha_innodb_stat_not_initialized';
 create table t1(a int not null primary key, b int, c int, key(b), key(c)) engine=innodb;
 create procedure innodb_insert_proc (repeat_count int)
@@ -30,4 +30,4 @@ count(1)
 781
 drop procedure innodb_insert_proc;
 drop table t1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/innodb/r/innodb_bug11754376.result

@@ -1,5 +1,5 @@
 CREATE TABLE bug11754376 (c INT) ENGINE=INNODB;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET SESSION DEBUG_DBUG='+d,test_normalize_table_name_low';
 DROP TABLE bug11754376;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/innodb/r/innodb_bug56947.result

@@ -1,6 +1,6 @@
 SET GLOBAL innodb_file_per_table=0;
 create table bug56947(a int not null) engine = innodb;
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
 alter table bug56947 add unique index (a);
 ERROR HY000: Got error 11 "xxx" from storage engine InnoDB
@@ -9,4 +9,4 @@ Table	Op	Msg_type	Msg_text
 test.bug56947	check	status	OK
 drop table bug56947;
 SET @@global.innodb_file_per_table=DEFAULT;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/innodb/r/innodb_corrupt_bit.result

@@ -24,7 +24,7 @@ test.corrupt_bit_test_ā	check	Warning	InnoDB: Index idx is marked as corrupted
 test.corrupt_bit_test_ā	check	Warning	InnoDB: Index idxā is marked as corrupted
 test.corrupt_bit_test_ā	check	Warning	InnoDB: Index idxē is marked as corrupted
 test.corrupt_bit_test_ā	check	error	Corrupt
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 CREATE INDEX idx3 ON corrupt_bit_test_ā(b, c);
 ERROR HY000: Index idx is corrupted
 CREATE INDEX idx4 ON corrupt_bit_test_ā(b, z);

mysql-test/suite/innodb/r/innodb_sys_semaphore_waits.result

@@ -4,7 +4,7 @@ drop table if exists t1;
 connection con1;
 create table t1 (id integer, x integer) engine = InnoDB;
 insert into t1 values(0, 0);
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set DEBUG_DBUG='+d,fatal-semaphore-timeout';
 set autocommit=0;
 # Sending query on con1,
@@ -22,6 +22,6 @@ connection default;
 # Waitting for reconnect after mysqld restarts
 # Reconnected after mysqld was successfully restarted
 # Cleaning up before exit
-set debug_dbug = @saved_dbug;
+SET debug_dbug = @saved_dbug;
 drop table if exists t1;
 # Clean exit

mysql-test/suite/innodb/r/truncate_inject.result

@@ -7,10 +7,10 @@ insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
-SET debug_dbug = '+d,ib_err_trunc_assigning_undo_log';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_assigning_undo_log';
 truncate table t;
 ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
@@ -20,10 +20,10 @@ i	f	c
 2	2.2	b
 3	3.3	c
 # 2. Error while preparing for truncate
-SET debug_dbug = '+d,ib_err_trunc_preparing_for_truncate';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_preparing_for_truncate';
 truncate table t;
 ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
@@ -33,10 +33,10 @@ i	f	c
 2	2.2	b
 3	3.3	c
 # 3. Error while dropping/creating indexes
-SET debug_dbug = '+d,ib_err_trunc_drop_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_drop_index';
 truncate table t;
 ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	Warning	InnoDB: Index PRIMARY is marked as corrupted
@@ -50,10 +50,10 @@ insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
-SET debug_dbug = '+d,ib_err_trunc_create_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_create_index';
 truncate table t;
 ERROR HY000: Got error 168 "Unknown (generic) error from engine" from storage engine InnoDB
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	Warning	InnoDB: Index PRIMARY is marked as corrupted
@@ -67,9 +67,9 @@ insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
-SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
@@ -85,9 +85,9 @@ insert into t values (1, 1.1, 'mysql is now oracle company'),
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
-SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
@@ -103,9 +103,9 @@ insert into t values (1, 1.1, 'mysql is now oracle company'),
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
-SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK

mysql-test/suite/innodb/t/blob-update-debug.test

@@ -12,8 +12,8 @@ create table t1 (f1 int primary key, f2 blob) engine = innodb;
 insert into t1 values (1, repeat('*', 50000));
 select f1, substring(f2, 1, 40) from t1;
 set @saved_debug = @@session.debug_dbug;
-set debug_dbug = 'd,row_ins_index_entry_timeout';
+SET debug_dbug = 'd,row_ins_index_entry_timeout';
 update t1 set f1 = 3;
 select f1, substring(f2, 1, 40) from t1;
 drop table t1;
-set debug_dbug= @saved_debug;
+SET debug_dbug= @saved_debug;

mysql-test/suite/innodb/t/innodb-replace-debug.test

@@ -9,8 +9,8 @@ create table t1 (f1 int primary key, f2 int, f3 int, unique key k1(f2),
   key k2(f3)) engine=innodb;
 insert into t1 values (14, 24, 34);
 set @old_dbug= @@session.debug_dbug;
-set debug_dbug = '+d,row_ins_sec_index_entry_timeout';
+SET debug_dbug = '+d,row_ins_sec_index_entry_timeout';
 replace into t1 values (14, 25, 34);
 select * from t1;
 drop table t1;
-set debug_dbug = @old_dbug;
+SET debug_dbug = @old_dbug;

mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test

@@ -6,7 +6,7 @@
 
 call mtr.add_suppression("InnoDB: Warning: Index.*");
 # This caused crash earlier
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set DEBUG_DBUG='+d,ib_ha_innodb_stat_not_initialized';
 create table t1(a int not null primary key, b int, c int, key(b), key(c)) engine=innodb;
 
@@ -37,4 +37,4 @@ select count(1) from t1 where c between 7 and 787;
 
 drop procedure innodb_insert_proc;
 drop table t1;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/innodb/t/innodb_bug11754376.test

@@ -8,8 +8,8 @@
 CREATE TABLE bug11754376 (c INT) ENGINE=INNODB;
 
 # This will invoke test_normalize_table_name_low() in debug builds
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET SESSION DEBUG_DBUG='+d,test_normalize_table_name_low';
 
 DROP TABLE bug11754376;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/innodb/t/innodb_bug56947.test

@@ -7,7 +7,7 @@
 SET GLOBAL innodb_file_per_table=0;
 create table bug56947(a int not null) engine = innodb;
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
 --replace_regex /"[^"]*"/"xxx"/
 --error ER_GET_ERRNO
@@ -16,4 +16,4 @@ check table bug56947;
 
 drop table bug56947;
 SET @@global.innodb_file_per_table=DEFAULT;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/innodb/t/innodb_corrupt_bit.test

@@ -36,7 +36,7 @@ select count(*) from corrupt_bit_test_ā;
 SET @save_dbug = @@SESSION.debug_dbug;
 SET debug_dbug = '+d,dict_set_index_corrupted';
 check table corrupt_bit_test_ā;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 
 # Cannot create new indexes while corrupted indexes exist
 --error ER_INDEX_CORRUPT

mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test

@@ -17,7 +17,7 @@ eval create table t1 (id integer, x integer) engine = InnoDB;
 insert into t1 values(0, 0);
 
 # Enable the debug injection.
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set DEBUG_DBUG='+d,fatal-semaphore-timeout';
 set autocommit=0;
 
@@ -108,7 +108,7 @@ source include/wait_until_connected_again.inc;
 
 --echo # Cleaning up before exit
 --disable_warnings
-set debug_dbug = @saved_dbug;
+SET debug_dbug = @saved_dbug;
 drop table if exists t1;
 --enable_warnings
 

mysql-test/suite/innodb/t/redo_log_during_checkpoint.test

@@ -33,8 +33,8 @@ while ($i)
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
 --exec echo "wait" > $_expect_file_name
 
-set debug_dbug = '+d,increase_mtr_checkpoint_size';
-set debug_dbug = '+d,crash_after_checkpoint';
+SET debug_dbug = '+d,increase_mtr_checkpoint_size';
+SET debug_dbug = '+d,crash_after_checkpoint';
 --error 2013
 set global innodb_log_checkpoint_now = 1;
 
@@ -64,7 +64,7 @@ while ($i)
 --enable_query_log
 
 --exec echo "wait" > $_expect_file_name
-set debug_dbug = '+d,crash_after_checkpoint';
+SET debug_dbug = '+d,crash_after_checkpoint';
 --error 2013
 set global innodb_log_checkpoint_now = 1;
 

mysql-test/suite/innodb/t/truncate_inject.test

@@ -14,26 +14,26 @@ ENGINE = InnoDB;
 insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
 check table t;
 #
-SET debug_dbug = '+d,ib_err_trunc_assigning_undo_log';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_assigning_undo_log';
 --error ER_GET_ERRNO
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 select * from t;
 
 --echo # 2. Error while preparing for truncate
-SET debug_dbug = '+d,ib_err_trunc_preparing_for_truncate';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_preparing_for_truncate';
 --error ER_GET_ERRNO
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 select * from t;
 
 --echo # 3. Error while dropping/creating indexes
-SET debug_dbug = '+d,ib_err_trunc_drop_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_drop_index';
 --error ER_GET_ERRNO
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 --error ER_TABLE_CORRUPT,ER_GET_ERRNO
 select * from t;
@@ -44,10 +44,10 @@ ENGINE = InnoDB;
 insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
 check table t;
 
-SET debug_dbug = '+d,ib_err_trunc_create_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_create_index';
 --error ER_GET_ERRNO
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 check table t;
 --error ER_TABLE_CORRUPT,ER_GET_ERRNO
 select * from t;
@@ -58,9 +58,9 @@ ENGINE = InnoDB;
 insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
 check table t;
 
-SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 
 check table t;
 select * from t;
@@ -73,9 +73,9 @@ insert into t values (1, 1.1, 'mysql is now oracle company'),
 		     (2, 2.2, 'innodb is part of mysql'),
 		     (3, 3.3, 'innodb is default storage engine of mysql');
 check table t;
-SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 
 check table t;
 select * from t;
@@ -88,9 +88,9 @@ insert into t values (1, 1.1, 'mysql is now oracle company'),
 		     (2, 2.2, 'innodb is part of mysql'),
 		     (3, 3.3, 'innodb is default storage engine of mysql');
 check table t;
-SET debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
+SET @@SESSION.debug_dbug = '+d,ib_err_trunc_temp_recreate_index';
 truncate table t;
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 
 check table t;
 select * from t order by i;

mysql-test/suite/innodb_fts/r/concurrent_insert.result

@@ -17,7 +17,7 @@ INSERT INTO t1 VALUES('test');
 CREATE TABLE t2 (f1 char(100), FULLTEXT idx1(f1))ENGINE=InnoDB;
 INSERT INTO t2 VALUES('mariadb');
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug ='+d,fts_instrument_sync_request,ib_optimize_wq_hang';
 SET DEBUG_SYNC= 'fts_instrument_sync_request
 		 SIGNAL drop_index_start WAIT_FOR sync_op';
@@ -29,7 +29,7 @@ ALTER TABLE t2 drop index idx1;
 connection default;
 set DEBUG_SYNC= 'now SIGNAL fts_drop_index';
 connection con1;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 drop table t1, t2;
 connection default;
 set DEBUG_SYNC=RESET;

mysql-test/suite/innodb_fts/t/concurrent_insert.test

@@ -29,7 +29,7 @@ CREATE TABLE t2 (f1 char(100), FULLTEXT idx1(f1))ENGINE=InnoDB;
 INSERT INTO t2 VALUES('mariadb');
 
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug ='+d,fts_instrument_sync_request,ib_optimize_wq_hang';
 SET DEBUG_SYNC= 'fts_instrument_sync_request
 		 SIGNAL drop_index_start WAIT_FOR sync_op';
@@ -46,7 +46,7 @@ set DEBUG_SYNC= 'now SIGNAL fts_drop_index';
 
 connection con1;
 reap;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 drop table t1, t2;
 connection default;
 set DEBUG_SYNC=RESET;

mysql-test/suite/innodb_gis/t/rtree_debug.test

@@ -53,7 +53,7 @@ SET @save_dbug = @@SESSION.debug_dbug;
 SET debug_dbug='+d,row_merge_ins_spatial_fail';
 --error ER_GET_ERRNO
 create spatial index idx2 on t1(c2);
-SET debug_dbug = @save_dbug;
+SET @@SESSION.debug_dbug = @save_dbug;
 show create table t1;
 
 # Check table.

mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result

@@ -1,4 +1,4 @@
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 create table `t1` (`c1` char(1) default null,`c2` char(10) default null,
 key (`c1`))
@@ -8,4 +8,4 @@ select * from `t1` where `c1`='3' for update;
 c1	c2
 3	NULL
 drop table `t1`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result

@@ -1,7 +1,7 @@
 #
 # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on
 #
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t (
 dummy INT PRIMARY KEY, 
@@ -14,4 +14,4 @@ dummy	a	b
 3	3	3
 5	5	5
 DROP TABLE t;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result

@@ -1,4 +1,4 @@
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 drop table if exists `t1`;
 Warnings:
@@ -7,4 +7,4 @@ create table `t1` (`c` bigint, key(`c`),`a` int)engine=innodb;
 insert into `t1` values(2,2);
 delete `t1` from `t1` `a`, `t1` where `a`.`a`=`t1`.`c` ;
 drop table `t1`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result

@@ -1,4 +1,4 @@
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -253,4 +253,4 @@ Warning	1292	Truncated incorrect DOUBLE value: 'd'
 Warning	1292	Truncated incorrect DOUBLE value: 'd'
 Warning	1292	Truncated incorrect DOUBLE value: 'd'
 drop table `table5`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result

@@ -1,4 +1,4 @@
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY
 KEY(c1), UNIQUE INDEX(c2)) engine=innodb;
@@ -10,4 +10,4 @@ SELECT * FROM t1 WHERE c2 <=> NULL ORDER BY c2 LIMIT 2;
 c1	c2	c3
 08:29:45	NULL	2009-02-01
 drop table `t1`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result

@@ -1,7 +1,7 @@
 #
 # Bug#43360 - Server crash with a simple multi-table update
 #
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1 (
 a CHAR(2) NOT NULL PRIMARY KEY, 
@@ -43,4 +43,4 @@ AB	Sweden
 MS	United States of Ame
 JA	USA
 DROP TABLE t1,t2;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result

@@ -1,7 +1,7 @@
 #
 # Bug#43448 - Server crashes on multi table delete with Innodb
 #
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1 (
 id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
@@ -29,4 +29,4 @@ DELETE t1, t2, t3
 FROM t1, t2, t3 
 WHERE t1.id1 = t2.id2 AND t2.id2 = t3.id3 AND t1.id1 > 5;
 DROP TABLE t1, t2, t3;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result

@@ -1,7 +1,7 @@
 set storage_engine=innodb;
 set @save_time_zone= @@time_zone;
 set time_zone='+03:00';
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 CREATE TABLE t1(c1 TIMESTAMP NOT NULL, c2 TIMESTAMP NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
 INSERT INTO t1 VALUES('98-12-31 11:30:45','98.12.31 11+30+45','98-12-31 11:30:45','98.12.31 11+30+45'),('98/12/30 11*30*45','98@12@30 11^30^45','98/12/30 11*30*45','98@12@30 11^30^45'),('98-12-29','98.12.29','98-12-29','98.12.29'),('98/12/28','98@12@28','98/12/28','98@12@28');
@@ -101,4 +101,4 @@ c1	c2	c3	c4
 2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
 DROP TABLE t1;
 set time_zone= @save_time_zone;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test

@@ -4,7 +4,7 @@
 --source include/have_innodb.inc
 
 # crash requires this
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 
 create table `t1` (`c1` char(1) default null,`c2` char(10) default null,
@@ -13,4 +13,4 @@ engine=innodb default charset=latin1;
 insert into `t1` values ('3',null);
 select * from `t1` where `c1`='3' for update;
 drop table `t1`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test

@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 # Crash requires that we enable Index Condition Pushdown in InnoDB
 set session debug_dbug="+d,optimizer_innodb_icp";
 
@@ -20,4 +20,4 @@ INSERT INTO t VALUES (1,1,1),(3,3,3),(5,5,5);
 SELECT * FROM t WHERE a > 2 FOR UPDATE;
 
 DROP TABLE t;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test

@@ -5,7 +5,7 @@
 --source include/have_innodb.inc
 
 # crash requires this
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 
 drop table if exists `t1`;
@@ -13,4 +13,4 @@ create table `t1` (`c` bigint, key(`c`),`a` int)engine=innodb;
 insert into `t1` values(2,2);
 delete `t1` from `t1` `a`, `t1` where `a`.`a`=`t1`.`c` ;
 drop table `t1`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test

@@ -6,7 +6,7 @@
 
 --source include/have_innodb.inc
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 # Valgrind errors happen only with this:
 set session debug_dbug="+d,optimizer_innodb_icp";
 
@@ -247,4 +247,4 @@ UNLOCK TABLES;
 select * from `table5` where  (col2 <= '6566-06-15' AND col24 <> 'd')  group by `col83` order by `col83` desc  ;
 
 drop table `table5`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test

@@ -4,7 +4,7 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY
@@ -16,4 +16,4 @@ SELECT * FROM t1 WHERE c2 <=> NULL ORDER BY c2 LIMIT 2;
 SELECT * FROM t1 WHERE c2 <=> NULL ORDER BY c2 LIMIT 2;
 
 drop table `t1`;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test

@@ -6,7 +6,7 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 # crash requires this
 set session debug_dbug="+d,optimizer_innodb_icp";
 
@@ -43,4 +43,4 @@ SELECT * FROM t1;
 SELECT * FROM t2;
 
 DROP TABLE t1,t2;   
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test

@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_innodb.inc
 
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 # crash requires ICP support in InnoDB
 set session debug_dbug="+d,optimizer_innodb_icp";
 
@@ -59,4 +59,4 @@ FROM t1, t2, t3
 WHERE t1.id1 = t2.id2 AND t2.id2 = t3.id3 AND t1.id1 > 5;
 
 DROP TABLE t1, t2, t3;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test

@@ -6,7 +6,7 @@
 set storage_engine=innodb;
 set @save_time_zone= @@time_zone;
 set time_zone='+03:00';
-set @saved_dbug = @@session.debug_dbug;
+SET @saved_dbug = @@SESSION.debug_dbug;
 set session debug_dbug="+d,optimizer_innodb_icp";
 
 ######## Running INSERT tests for TIMESTAMP ########
@@ -84,4 +84,4 @@ SELECT * FROM t1 WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') ORDER
 DROP TABLE t1;
 
 set time_zone= @save_time_zone;
-set debug_dbug= @saved_dbug;
+SET debug_dbug= @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 connect  con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'192.0.2.4';
 drop user 'root'@'192.0.2.4';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 connect  con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'192.0.2.4';
 drop user 'root'@'192.0.2.4';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 connect  con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
 connect  con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -104,4 +104,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
 revoke select on test.* from 'root'@'192.0.2.4';
 drop user 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'192.0.2.4';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
@@ -195,5 +195,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com'
   FROM 'plug'@'santa.claus.ipv4.example.com';
 DROP USER 'plug'@'santa.claus.ipv4.example.com';
 DROP USER 'plug_dest'@'santa.claus.ipv4.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 delete from mysql.plugin where name='test_plugin_server';

mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result

@@ -25,7 +25,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
 ERROR 08S01: Bad handshake
 connection default;
@@ -428,4 +428,4 @@ drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on test.* from 'quota'@'santa.claus.ipv4.example.com';
 drop user 'quota'@'santa.claus.ipv4.example.com';
 set global max_connect_errors = @saved_max_connect_errors;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_format.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result

@@ -25,7 +25,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 connect  con2a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
 select "Con2a is alive";
@@ -703,4 +703,4 @@ disconnect tmp_con7;
 set global max_connections = @saved_max_connections;
 set global max_user_connections = @saved_max_user_connections;
 drop user 'quota'@'santa.claus.ipv4.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
 connect  con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -179,4 +179,4 @@ revoke select on test.* from 'root'@'192.0.2.4';
 revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'192.0.2.4';
 drop user 'root'@'santa.claus.ipv4.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
@@ -143,4 +143,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
 connect  con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'192.0.2.4';
 drop user 'root'@'192.0.2.4';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
@@ -208,4 +208,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 drop user 'user_with'@'santa.claus.ipv4.example.com';
 drop user 'user_without'@'santa.claus.ipv4.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result

@@ -28,7 +28,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
@@ -152,4 +152,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 drop user 'user_ssl'@'santa.claus.ipv4.example.com';
 drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
 connect  con2,"::1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'2001:db8::6:6';
 drop user 'root'@'2001:db8::6:6';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
 connect  con2,"::1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'2001:db8::6:6';
 drop user 'root'@'2001:db8::6:6';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 connect  con2,"::1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
 drop user 'root'@'santa.claus.ipv6.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result

@@ -19,7 +19,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
@@ -81,4 +81,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
 connect  con2,"::1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -104,4 +104,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
 revoke select on test.* from 'root'@'2001:db8::6:6';
 drop user 'root'@'santa.claus.ipv6.example.com';
 drop user 'root'@'2001:db8::6:6';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
@@ -195,5 +195,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com'
   FROM 'plug'@'santa.claus.ipv6.example.com';
 DROP USER 'plug'@'santa.claus.ipv6.example.com';
 DROP USER 'plug_dest'@'santa.claus.ipv6.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 delete from mysql.plugin where name='test_plugin_server';

mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result

@@ -25,7 +25,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
 ERROR 08S01: Bad handshake
 connection default;
@@ -428,4 +428,4 @@ drop user 'root'@'santa.claus.ipv6.example.com';
 revoke select on test.* from 'quota'@'santa.claus.ipv6.example.com';
 drop user 'quota'@'santa.claus.ipv6.example.com';
 set global max_connect_errors = @saved_max_connect_errors;
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result

@@ -25,7 +25,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 connect  con2a,"::1",quota,,test,$MASTER_MYPORT,;
 select "Con2a is alive";
@@ -703,4 +703,4 @@ disconnect tmp_con7;
 set global max_connections = @saved_max_connections;
 set global max_user_connections = @saved_max_user_connections;
 drop user 'quota'@'santa.claus.ipv6.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
 connect  con2,"::1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -179,4 +179,4 @@ revoke select on test.* from 'root'@'2001:db8::6:6';
 revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
 drop user 'root'@'2001:db8::6:6';
 drop user 'root'@'santa.claus.ipv6.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
@@ -143,4 +143,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result

@@ -22,7 +22,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
 connect  con2,"::1",root,,test,$MASTER_MYPORT,;
 select "Con2 is alive";
@@ -100,4 +100,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'2001:db8::6:6';
 drop user 'root'@'2001:db8::6:6';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result

@@ -20,7 +20,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
@@ -82,4 +82,4 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result

@@ -24,7 +24,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
@@ -208,4 +208,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 drop user 'user_with'@'santa.claus.ipv6.example.com';
 drop user 'user_without'@'santa.claus.ipv6.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result

@@ -28,7 +28,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
@@ -152,4 +152,4 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 drop user 'user_ssl'@'santa.claus.ipv6.example.com';
 drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com';
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;

mysql-test/suite/perfschema/r/hostcache_peer_addr.result

@@ -27,7 +27,7 @@ current_user()
 root@localhost
 disconnect con1;
 connection default;
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_error";
 ERROR HY000: Can't get hostname for your address
 connection default;
@@ -51,7 +51,7 @@ Connection_errors_peer_address	2
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
 "Dumping performance_schema.host_cache"
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 flush status;
 show global status like "connection_errors_%";
 Variable_name	Value

mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test

@@ -27,7 +27,7 @@ select current_user();
 disconnect con1;
 
 --connection default
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 
 connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
@@ -49,5 +49,5 @@ disconnect con3;
 revoke select on test.* from 'root'@'192.0.2.4';
 drop user 'root'@'192.0.2.4';
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 

mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test

@@ -25,7 +25,7 @@ select current_user();
 disconnect con1;
 
 --connection default
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 
 --disable_query_log
@@ -44,5 +44,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 --connection default
 --source ../include/hostcache_dump.inc
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 

mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test

@@ -30,7 +30,7 @@ select current_user();
 disconnect con1;
 
 --connection default
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 
 connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
@@ -52,5 +52,5 @@ disconnect con3;
 revoke select on test.* from 'root'@'192.0.2.4';
 drop user 'root'@'192.0.2.4';
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 

mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test

@@ -27,7 +27,7 @@ select current_user();
 disconnect con1;
 
 --connection default
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 
 --disable_query_log
@@ -46,5 +46,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 --connection default
 --source ../include/hostcache_dump.inc
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;
 

mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test

@@ -28,7 +28,7 @@ select current_user();
 disconnect con1;
 
 --connection default
-set @saved_dbug = @@global.debug_dbug;
+SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 
 connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
@@ -50,5 +50,5 @@ disconnect con3;
 revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 
-set @@global.debug_dbug = @saved_dbug;
+SET @@GLOBAL.debug_dbug = @saved_dbug;