From ec73d940b18cb97c8de86adc09dc843a79f3e5ee Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 2 Jul 2008 17:04:45 +0200 Subject: [PATCH] BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuild The previous fix for the bug was incomplete. The test failed because t2 did not exist on the slave (since the slave was lagging) when the wait_condition was executed. Fixed by inserting sync_slave_with_master just after t2 was created. --- mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test index 548dd0f1d62..b7948780c19 100644 --- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test +++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test @@ -147,6 +147,9 @@ 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 |; @@ -300,7 +303,7 @@ insert delayed into t2 values(@a); # sync_slave_with_master is later called). Instead, we wait until the # rows make it to t2 on the slave. connection slave; -let $wait_condition= SELECT COUNT(*) = 19 FROM t2; +let $wait_condition= SELECT COUNT(*) = 19 FROM mysqltest1.t2; --source include/wait_condition.inc connection master;