summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/include/mtr_check.sql3
-rw-r--r--mysql-test/r/myisam_optimize.result1
-rw-r--r--mysql-test/r/processlist.result1
-rw-r--r--mysql-test/r/quick_select_4161.result1
-rw-r--r--mysql-test/suite/rpl/r/rpl_mdev359.result1
-rw-r--r--mysql-test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result1
-rw-r--r--mysql-test/suite/rpl/r/rpl_stop_slave.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_mdev359.test1
-rw-r--r--mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test1
-rw-r--r--mysql-test/suite/rpl/t/rpl_stop_slave.test2
-rw-r--r--mysql-test/t/myisam_optimize.test1
-rw-r--r--mysql-test/t/processlist.test2
-rw-r--r--mysql-test/t/quick_select_4161.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_mariadb/r/optimize.result1
-rw-r--r--storage/tokudb/mysql-test/tokudb_mariadb/t/optimize.test1
15 files changed, 17 insertions, 3 deletions
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql
index 7cca74d52f0..e0d4f407633 100644
--- a/mysql-test/include/mtr_check.sql
+++ b/mysql-test/include/mtr_check.sql
@@ -78,6 +78,9 @@ BEGIN
-- verify that no plugin changed its disabled/enabled state
SELECT * FROM INFORMATION_SCHEMA.PLUGINS;
+ select * from information_schema.session_variables
+ where variable_name = 'debug_sync';
+
show status like 'slave_open_temp_tables';
END||
diff --git a/mysql-test/r/myisam_optimize.result b/mysql-test/r/myisam_optimize.result
index 185d49e6391..341c3e180b8 100644
--- a/mysql-test/r/myisam_optimize.result
+++ b/mysql-test/r/myisam_optimize.result
@@ -21,3 +21,4 @@ a left(b,10)
3 CCCCCCCCCC
4 CCCCCCCCCC
drop table t1;
+set debug_sync='reset';
diff --git a/mysql-test/r/processlist.result b/mysql-test/r/processlist.result
index fc03f920533..127fa96b84b 100644
--- a/mysql-test/r/processlist.result
+++ b/mysql-test/r/processlist.result
@@ -13,3 +13,4 @@ sleep(5)
select command, time < 5 from information_schema.processlist where id != connection_id();
command time < 5
Sleep 1
+set debug_sync='reset';
diff --git a/mysql-test/r/quick_select_4161.result b/mysql-test/r/quick_select_4161.result
index 862be6055ce..18ac4362a84 100644
--- a/mysql-test/r/quick_select_4161.result
+++ b/mysql-test/r/quick_select_4161.result
@@ -29,3 +29,4 @@ kill %connection%;
set debug_sync='now signal done';
Got one of the listed errors
drop table t1;
+set debug_sync='reset';
diff --git a/mysql-test/suite/rpl/r/rpl_mdev359.result b/mysql-test/suite/rpl/r/rpl_mdev359.result
index f4382f672e4..f0709a8158f 100644
--- a/mysql-test/suite/rpl/r/rpl_mdev359.result
+++ b/mysql-test/suite/rpl/r/rpl_mdev359.result
@@ -9,5 +9,6 @@ SET DEBUG_SYNC= "now WAIT_FOR m1_ready";
SET GLOBAL rpl_semi_sync_master_enabled = OFF;
SET DEBUG_SYNC= "now SIGNAL m1_cont";
DROP TABLE t1;
+SET DEBUG_SYNC= "RESET";
UNINSTALL PLUGIN rpl_semi_sync_master;
include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result b/mysql-test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result
index f69a323f980..033027addf9 100644
--- a/mysql-test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result
+++ b/mysql-test/suite/rpl/r/rpl_start_slave_deadlock_sys_vars.result
@@ -28,4 +28,5 @@ SET DEBUG_SYNC='now SIGNAL go';
# connection: slave
# cleanup
SET @@GLOBAL.slave_net_timeout = @save_slave_net_timeout;
+SET DEBUG_SYNC='RESET';
include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result
index 3d9bad18ab6..5959ee09993 100644
--- a/mysql-test/suite/rpl/r/rpl_stop_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result
@@ -113,7 +113,6 @@ ROLLBACK;
[connection master]
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
-SET DEBUG_SYNC= 'RESET';
[connection slave]
include/wait_for_slave_to_stop.inc
[connection slave1]
@@ -121,3 +120,4 @@ include/start_slave.inc
[connection master]
DROP TABLE t1, t2;
include/rpl_end.inc
+SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/suite/rpl/t/rpl_mdev359.test b/mysql-test/suite/rpl/t/rpl_mdev359.test
index ef4e41f5291..e657474129e 100644
--- a/mysql-test/suite/rpl/t/rpl_mdev359.test
+++ b/mysql-test/suite/rpl/t/rpl_mdev359.test
@@ -28,6 +28,7 @@ SET DEBUG_SYNC= "now SIGNAL m1_cont";
connection master;
DROP TABLE t1;
+SET DEBUG_SYNC= "RESET";
disable_warnings;
UNINSTALL PLUGIN rpl_semi_sync_master;
diff --git a/mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test b/mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test
index 3eaff761108..96a629484f2 100644
--- a/mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test
+++ b/mysql-test/suite/rpl/t/rpl_start_slave_deadlock_sys_vars.test
@@ -53,5 +53,6 @@ disconnect slave2;
connection slave;
--echo # cleanup
SET @@GLOBAL.slave_net_timeout = @save_slave_net_timeout;
+SET DEBUG_SYNC='RESET';
source include/rpl_end.inc;
diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test
index 7e57359877b..d9d7f39c321 100644
--- a/mysql-test/suite/rpl/t/rpl_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test
@@ -107,7 +107,6 @@ ROLLBACK;
--source include/rpl_connection_master.inc
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
-SET DEBUG_SYNC= 'RESET';
--source include/rpl_connection_slave.inc
source include/wait_for_slave_to_stop.inc;
@@ -122,3 +121,4 @@ DROP TABLE t1, t2;
eval SET GLOBAL debug_dbug= '$debug_save';
--enable_query_log
--source include/rpl_end.inc
+SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/t/myisam_optimize.test b/mysql-test/t/myisam_optimize.test
index da47a7a4127..3788534e2a5 100644
--- a/mysql-test/t/myisam_optimize.test
+++ b/mysql-test/t/myisam_optimize.test
@@ -44,4 +44,5 @@ disconnect con2;
connection default;
drop table t1;
+set debug_sync='reset';
diff --git a/mysql-test/t/processlist.test b/mysql-test/t/processlist.test
index c7b775cf992..7a2b33699d5 100644
--- a/mysql-test/t/processlist.test
+++ b/mysql-test/t/processlist.test
@@ -32,4 +32,4 @@ connection default;
select command, time < 5 from information_schema.processlist where id != connection_id();
disconnect con1;
-
+set debug_sync='reset';
diff --git a/mysql-test/t/quick_select_4161.test b/mysql-test/t/quick_select_4161.test
index 1e746754b41..87323087622 100644
--- a/mysql-test/t/quick_select_4161.test
+++ b/mysql-test/t/quick_select_4161.test
@@ -50,4 +50,5 @@ connection default;
disconnect killee;
drop table t1;
+set debug_sync='reset';
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/r/optimize.result b/storage/tokudb/mysql-test/tokudb_mariadb/r/optimize.result
index 3fafa68f907..5151f2bc895 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/r/optimize.result
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/r/optimize.result
@@ -11,3 +11,4 @@ set debug_sync='now SIGNAL go';
Table Op Msg_type Msg_text
test.t1 optimize status OK
drop table t1;
+set debug_sync='reset';
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/t/optimize.test b/storage/tokudb/mysql-test/tokudb_mariadb/t/optimize.test
index 20a6daf43fc..0eae53e77f9 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/t/optimize.test
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/t/optimize.test
@@ -14,4 +14,5 @@ connection default;
reap;
drop table t1;
+set debug_sync='reset';
View Lorry Controller Status