MDEV-21360 debug_dbug pre-test value restoration issues

10 files changed, 21 insertions, 6 deletions

diff --git a/mysql-test/suite/innodb/r/blob-update-debug.result b/mysql-test/suite/innodb/r/blob-update-debug.result
index 1360745b7e6..0d0fc6d5070 100644
--- a/mysql-test/suite/innodb/r/blob-update-debug.result
+++ b/mysql-test/suite/innodb/r/blob-update-debug.result
@@ -7,9 +7,11 @@ insert into t1 values (1, repeat('*', 50000));
 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';
 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;
diff --git a/mysql-test/suite/innodb/r/innodb-stats-initialize-failure.result b/mysql-test/suite/innodb/r/innodb-stats-initialize-failure.result
index ef2d3182b92..b48cfb05a5c 100644
--- a/mysql-test/suite/innodb/r/innodb-stats-initialize-failure.result
+++ b/mysql-test/suite/innodb/r/innodb-stats-initialize-failure.result
@@ -1,4 +1,5 @@
 call mtr.add_suppression("InnoDB: Warning: Index.*");
+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)
@@ -27,6 +28,6 @@ count(1)
 select count(1) from t1 where c between 7 and 787;
 count(1)
 781
-set DEBUG_DBUG=NULL;
 drop procedure innodb_insert_proc;
 drop table t1;
+set debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/r/innodb_bug11754376.result b/mysql-test/suite/innodb/r/innodb_bug11754376.result
index b9f2a169a73..a2c1ceed61f 100644
--- a/mysql-test/suite/innodb/r/innodb_bug11754376.result
+++ b/mysql-test/suite/innodb/r/innodb_bug11754376.result
@@ -1,3 +1,5 @@
 CREATE TABLE bug11754376 (c INT) ENGINE=INNODB;
+set @saved_dbug = @@session.debug_dbug;
 SET SESSION DEBUG_DBUG='+d,test_normalize_table_name_low';
 DROP TABLE bug11754376;
+set debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/r/innodb_bug56947.result b/mysql-test/suite/innodb/r/innodb_bug56947.result
index 4248013b088..981e08609a2 100644
--- a/mysql-test/suite/innodb/r/innodb_bug56947.result
+++ b/mysql-test/suite/innodb/r/innodb_bug56947.result
@@ -1,5 +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 DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
 alter table bug56947 add unique index (a);
 ERROR HY000: Got error 11 "xxx" from storage engine InnoDB
@@ -8,3 +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;
diff --git a/mysql-test/suite/innodb/r/innodb_sys_semaphore_waits.result b/mysql-test/suite/innodb/r/innodb_sys_semaphore_waits.result
index 5f14ad9b0d7..73b5f81a76f 100644
--- a/mysql-test/suite/innodb/r/innodb_sys_semaphore_waits.result
+++ b/mysql-test/suite/innodb/r/innodb_sys_semaphore_waits.result
@@ -4,6 +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 DEBUG_DBUG='+d,fatal-semaphore-timeout';
 set autocommit=0;
 # Sending query on con1,
@@ -21,6 +22,6 @@ connection default;
 # Waitting for reconnect after mysqld restarts
 # Reconnected after mysqld was successfully restarted
 # Cleaning up before exit
-set DEBUG_DBUG=NULL;
+set debug_dbug = @saved_dbug;
 drop table if exists t1;
 # Clean exit
diff --git a/mysql-test/suite/innodb/t/blob-update-debug.test b/mysql-test/suite/innodb/t/blob-update-debug.test
index 948cd749148..37c364290f4 100644
--- a/mysql-test/suite/innodb/t/blob-update-debug.test
+++ b/mysql-test/suite/innodb/t/blob-update-debug.test
@@ -11,7 +11,9 @@
 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';
 update t1 set f1 = 3;
 select f1, substring(f2, 1, 40) from t1;
 drop table t1;
+set debug_dbug= @saved_debug;
diff --git a/mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test b/mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test
index e480f0caf07..dc85aa6e892 100644
--- a/mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test
+++ b/mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test
@@ -6,6 +6,7 @@
 
 call mtr.add_suppression("InnoDB: Warning: Index.*");
 # This caused crash earlier
+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;
 
@@ -32,8 +33,8 @@ select count(1) from t1 where a between 5 and 100;
 select count(1) from t1 where b between 5 and 256;
 select count(1) from t1 where c between 7 and 787;
 
-set DEBUG_DBUG=NULL;
+
 
 drop procedure innodb_insert_proc;
 drop table t1;
-
+set debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/t/innodb_bug11754376.test b/mysql-test/suite/innodb/t/innodb_bug11754376.test
index a7f35c1a960..238c86194d6 100644
--- a/mysql-test/suite/innodb/t/innodb_bug11754376.test
+++ b/mysql-test/suite/innodb/t/innodb_bug11754376.test
@@ -8,7 +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 SESSION DEBUG_DBUG='+d,test_normalize_table_name_low';
 
 DROP TABLE bug11754376;
+set debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/t/innodb_bug56947.test b/mysql-test/suite/innodb/t/innodb_bug56947.test
index 84c5e70e1b5..98bca895e82 100644
--- a/mysql-test/suite/innodb/t/innodb_bug56947.test
+++ b/mysql-test/suite/innodb/t/innodb_bug56947.test
@@ -7,6 +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 DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
 --replace_regex /"[^"]*"/"xxx"/
 --error ER_GET_ERRNO
@@ -15,3 +16,4 @@ check table bug56947;
 
 drop table bug56947;
 SET @@global.innodb_file_per_table=DEFAULT;
+set debug_dbug= @saved_dbug;
diff --git a/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test b/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
index e7acb98b0d0..e7076527b2b 100644
--- a/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
+++ b/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
@@ -17,6 +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 DEBUG_DBUG='+d,fatal-semaphore-timeout';
 set autocommit=0;
 
@@ -107,7 +108,7 @@ source include/wait_until_connected_again.inc;
 
 --echo # Cleaning up before exit
 --disable_warnings
-set DEBUG_DBUG=NULL;
+set debug_dbug = @saved_dbug;
 drop table if exists t1;
 --enable_warnings