Switch back to master before cleanup of the created tables

That causes test case for bug#6880 to be run on the master
instead of the slave and thus the result files need to be updated
parent 51a71fb6
...@@ -125,6 +125,8 @@ show slave status; ...@@ -125,6 +125,8 @@ show slave status;
--error 1220 --error 1220
show binlog events in 'slave-bin.000005' from 4; show binlog events in 'slave-bin.000005' from 4;
connection master;
# The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here. # The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
DROP TABLE t1; DROP TABLE t1;
...@@ -149,3 +151,5 @@ drop table t1; ...@@ -149,3 +151,5 @@ drop table t1;
# End of 4.1 tests # End of 4.1 tests
sync_with_master;
...@@ -139,9 +139,9 @@ set insert_id=5; ...@@ -139,9 +139,9 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events; show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Table_map 2 # table_id: # (test.t1) master-bin.000001 # Table_map 1 # table_id: # (test.t1)
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select * from t1; select * from t1;
a b a b
1 1 1 1
......
...@@ -107,9 +107,9 @@ set insert_id=5; ...@@ -107,9 +107,9 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events; show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Table_map 2 # table_id: # (test.t1) master-bin.000001 # Table_map 1 # table_id: # (test.t1)
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select * from t1; select * from t1;
a b a b
1 1 1 1
......
...@@ -115,9 +115,9 @@ set insert_id=5; ...@@ -115,9 +115,9 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events; show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Table_map 2 # table_id: # (test.t1) master-bin.000001 # Table_map 1 # table_id: # (test.t1)
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select * from t1; select * from t1;
a b a b
1 1 1 1
......
...@@ -105,10 +105,10 @@ set insert_id=5; ...@@ -105,10 +105,10 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events; show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Intvar 2 # LAST_INSERT_ID=1 master-bin.000001 # Intvar 1 # LAST_INSERT_ID=1
slave-bin.000001 # Intvar 2 # INSERT_ID=5 master-bin.000001 # Intvar 1 # INSERT_ID=5
slave-bin.000001 # Query 2 # use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()) master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
select * from t1; select * from t1;
a b a b
1 1 1 1
......
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