Commit ebaac51c authored by Sergei Golubchik's avatar Sergei Golubchik

mtr: check that tests clean up debug_sync. fix tests that didn't.

parent 879a05ce
...@@ -78,6 +78,9 @@ BEGIN ...@@ -78,6 +78,9 @@ BEGIN
-- verify that no plugin changed its disabled/enabled state -- verify that no plugin changed its disabled/enabled state
SELECT * FROM INFORMATION_SCHEMA.PLUGINS; SELECT * FROM INFORMATION_SCHEMA.PLUGINS;
select * from information_schema.session_variables
where variable_name = 'debug_sync';
show status like 'slave_open_temp_tables'; show status like 'slave_open_temp_tables';
END|| END||
......
...@@ -21,3 +21,4 @@ a left(b,10) ...@@ -21,3 +21,4 @@ a left(b,10)
3 CCCCCCCCCC 3 CCCCCCCCCC
4 CCCCCCCCCC 4 CCCCCCCCCC
drop table t1; drop table t1;
set debug_sync='reset';
...@@ -13,3 +13,4 @@ sleep(5) ...@@ -13,3 +13,4 @@ sleep(5)
select command, time < 5 from information_schema.processlist where id != connection_id(); select command, time < 5 from information_schema.processlist where id != connection_id();
command time < 5 command time < 5
Sleep 1 Sleep 1
set debug_sync='reset';
...@@ -29,3 +29,4 @@ kill %connection%; ...@@ -29,3 +29,4 @@ kill %connection%;
set debug_sync='now signal done'; set debug_sync='now signal done';
Got one of the listed errors Got one of the listed errors
drop table t1; drop table t1;
set debug_sync='reset';
...@@ -9,5 +9,6 @@ SET DEBUG_SYNC= "now WAIT_FOR m1_ready"; ...@@ -9,5 +9,6 @@ SET DEBUG_SYNC= "now WAIT_FOR m1_ready";
SET GLOBAL rpl_semi_sync_master_enabled = OFF; SET GLOBAL rpl_semi_sync_master_enabled = OFF;
SET DEBUG_SYNC= "now SIGNAL m1_cont"; SET DEBUG_SYNC= "now SIGNAL m1_cont";
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC= "RESET";
UNINSTALL PLUGIN rpl_semi_sync_master; UNINSTALL PLUGIN rpl_semi_sync_master;
include/rpl_end.inc include/rpl_end.inc
...@@ -28,4 +28,5 @@ SET DEBUG_SYNC='now SIGNAL go'; ...@@ -28,4 +28,5 @@ SET DEBUG_SYNC='now SIGNAL go';
# connection: slave # connection: slave
# cleanup # cleanup
SET @@GLOBAL.slave_net_timeout = @save_slave_net_timeout; SET @@GLOBAL.slave_net_timeout = @save_slave_net_timeout;
SET DEBUG_SYNC='RESET';
include/rpl_end.inc include/rpl_end.inc
...@@ -113,7 +113,6 @@ ROLLBACK; ...@@ -113,7 +113,6 @@ ROLLBACK;
[connection master] [connection master]
SET DEBUG_SYNC= 'now SIGNAL signal.continue'; SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued'; SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
[connection slave] [connection slave]
include/wait_for_slave_to_stop.inc include/wait_for_slave_to_stop.inc
[connection slave1] [connection slave1]
...@@ -121,3 +120,4 @@ include/start_slave.inc ...@@ -121,3 +120,4 @@ include/start_slave.inc
[connection master] [connection master]
DROP TABLE t1, t2; DROP TABLE t1, t2;
include/rpl_end.inc include/rpl_end.inc
SET DEBUG_SYNC= 'RESET';
...@@ -28,6 +28,7 @@ SET DEBUG_SYNC= "now SIGNAL m1_cont"; ...@@ -28,6 +28,7 @@ SET DEBUG_SYNC= "now SIGNAL m1_cont";
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC= "RESET";
disable_warnings; disable_warnings;
UNINSTALL PLUGIN rpl_semi_sync_master; UNINSTALL PLUGIN rpl_semi_sync_master;
......
...@@ -53,5 +53,6 @@ disconnect slave2; ...@@ -53,5 +53,6 @@ disconnect slave2;
connection slave; connection slave;
--echo # cleanup --echo # cleanup
SET @@GLOBAL.slave_net_timeout = @save_slave_net_timeout; SET @@GLOBAL.slave_net_timeout = @save_slave_net_timeout;
SET DEBUG_SYNC='RESET';
source include/rpl_end.inc; source include/rpl_end.inc;
...@@ -107,7 +107,6 @@ ROLLBACK; ...@@ -107,7 +107,6 @@ ROLLBACK;
--source include/rpl_connection_master.inc --source include/rpl_connection_master.inc
SET DEBUG_SYNC= 'now SIGNAL signal.continue'; SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued'; SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
--source include/rpl_connection_slave.inc --source include/rpl_connection_slave.inc
source include/wait_for_slave_to_stop.inc; source include/wait_for_slave_to_stop.inc;
...@@ -122,3 +121,4 @@ DROP TABLE t1, t2; ...@@ -122,3 +121,4 @@ DROP TABLE t1, t2;
eval SET GLOBAL debug_dbug= '$debug_save'; eval SET GLOBAL debug_dbug= '$debug_save';
--enable_query_log --enable_query_log
--source include/rpl_end.inc --source include/rpl_end.inc
SET DEBUG_SYNC= 'RESET';
...@@ -44,4 +44,5 @@ disconnect con2; ...@@ -44,4 +44,5 @@ disconnect con2;
connection default; connection default;
drop table t1; drop table t1;
set debug_sync='reset';
...@@ -32,4 +32,4 @@ connection default; ...@@ -32,4 +32,4 @@ connection default;
select command, time < 5 from information_schema.processlist where id != connection_id(); select command, time < 5 from information_schema.processlist where id != connection_id();
disconnect con1; disconnect con1;
set debug_sync='reset';
...@@ -50,4 +50,5 @@ connection default; ...@@ -50,4 +50,5 @@ connection default;
disconnect killee; disconnect killee;
drop table t1; drop table t1;
set debug_sync='reset';
...@@ -11,3 +11,4 @@ set debug_sync='now SIGNAL go'; ...@@ -11,3 +11,4 @@ set debug_sync='now SIGNAL go';
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize status OK test.t1 optimize status OK
drop table t1; drop table t1;
set debug_sync='reset';
...@@ -14,4 +14,5 @@ connection default; ...@@ -14,4 +14,5 @@ connection default;
reap; reap;
drop table t1; drop table t1;
set debug_sync='reset';
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment