MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:July 3 2008 8:27am
Subject:bzr commit into mysql-5.1 branch (sven:2684) Bug#37200
View as plain text  
#At file:///home/sven/bzr/debug-max/5.1-bugteam/

 2684 Sven Sandberg	2008-07-03
      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.

=== 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-07-02 15:04:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test	2008-07-03 08:27:25 +0000
@@ -147,9 +147,6 @@ 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);
-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.
 let $wait_condition= SELECT COUNT(*) = 19 FROM mysqltest1.t2;
 --source include/
 connection master;

bzr commit into mysql-5.1 branch (sven:2684) Bug#37200Sven Sandberg3 Jul