bzr commit into mysql-6.0 branch (sven:2719) Bug#37884

[Sven Sandberg]

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

 2719 Sven Sandberg	2008-07-18
      BUG#37884: rpl_row_basic_2myisam and rpl_row_basic_3innodb fail sporadically in pushbuild
      Problem: sync_slave_with_master was missing, causing result
      mismatch.
      Fix: added sync_slave_with_master.
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test

per-file messages:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
    Added sync_slave_with_master.
=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-07-09 13:25:06 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-07-18 10:36:37 +0000
@@ -354,6 +354,7 @@ CREATE TABLE t7 (i INT NOT NULL,
 connection master;
 INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t1;
 let $diff_table_2=slave:test.t1;
@@ -363,6 +364,7 @@ source include/diff_tables.inc;
 connection master;
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t2;
 let $diff_table_2=slave:test.t2;
@@ -387,6 +389,7 @@ source include/wait_for_slave_to_start.i
 connection master;
 INSERT INTO t4 VALUES (1, "", 1);
 INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t4;
 let $diff_table_2=slave:test.t4;
@@ -426,6 +429,7 @@ source include/wait_for_slave_to_start.i
 connection master;
 INSERT INTO t7 VALUES (1, "", 1);
 INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t7;
 let $diff_table_2=slave:test.t7;