1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/main/error_simulation.result b/mysql-test/main/error_simulation.result
index 7e728d24fc8..457e5c8ec9c 100644
--- a/mysql-test/main/error_simulation.result
+++ b/mysql-test/main/error_simulation.result
@@ -10,6 +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 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)'
@@ -22,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 SESSION debug_dbug=DEFAULT;
+SET debug_dbug= @saved_dbug;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -42,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 SESSION debug_dbug=DEFAULT;
+SET debug_dbug= @saved_dbug;
 DROP TABLE t1;
 #
 # Bug#41660: Sort-index_merge for non-first join table may require 
@@ -79,7 +80,7 @@ a	a	b	filler
 7	1	1	data
 8	1	1	data
 9	1	1	data
-SET SESSION debug_dbug= DEFAULT;
+SET debug_dbug= @saved_dbug;
 SET optimizer_switch=@save_optimizer_switch;
 DROP TABLE t1, t2;
 #
@@ -92,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 SESSION debug_dbug = DEFAULT;
+SET debug_dbug= @saved_dbug;
 DROP TABLE t1,t2;
 #
 # End of 5.1 tests
@@ -126,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 SESSION debug_dbug=DEFAULT;
+SET debug_dbug= @saved_dbug;