Commit d47bf970 authored by Sven Sandberg's avatar Sven Sandberg
Browse files

BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuild 

This bug has been fixed in two slightly different ways in
6.0-rpl and {5.1,6.0}-bugteam. To avoid future merge
problems, I'm now copying the 6.0-rpl fix to 5.1-bugteam.
parent b2c852d8

mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test

+4 −5
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ create table t5 select * from t1 where 3 in (select 1 union select 2 union selec 
# what if UUID() is first:

insert into t5 select UUID() from t1 where 3 in (select 1 union select 2 union select 3 union select * from t4);



sync_slave_with_master;

connection master;



# inside a stored procedure



delimiter |;
@@ -301,8 +298,10 @@ insert delayed into t2 values(@a); 
# rows make it to t2 on the master (the rows may not be in the binlog

# at that time, and may still not be in the binlog when

# sync_slave_with_master is later called). Instead, we wait until the

# rows make it to t2 on the slave.

connection slave;

# rows make it to t2 on the slave. We first call

# sync_slave_with_master, so that we are sure that t2 has been created

# on the slave.

sync_slave_with_master;

let $wait_condition= SELECT COUNT(*) = 19 FROM mysqltest1.t2;

--source include/wait_condition.inc

connection master;