bzr commit into mysql-5.1 branch (sven:2683) Bug#37200

[Sven Sandberg]

#At file:///home/sven/bzr/debug-max/5.1-bugteam/

 2683 Sven Sandberg	2008-07-02
      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.
modified:
  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test

per-file messages:
  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
    Added sync_slave_with_master so that t2 exists for sure before
    the wait_condition is executed.
=== modified file 'mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test'
--- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test	2008-06-30 11:06:41 +0000
+++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test	2008-07-02 14:53:16 +0000
@@ -147,6 +147,9 @@ create table t5 select * from t1 where 3
 # 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 |;