bzr push into mysql-5.1 branch (hezx:2678 to 2679)

[He Zhenxing]

 2679 He Zhenxing	2008-08-14
      fix after merge
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test

 2678 He Zhenxing	2008-08-14 [merge]
      auto merge
modified:
  sql/sql_binlog.cc

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-08-14 06:27:18 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-08-14 08:27:28 +0000
@@ -356,8 +356,6 @@ INSERT INTO t1 VALUES (1, "", 1);
 INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
 sync_slave_with_master;
 
-sync_slave_with_master;
-
 let $diff_table_1=master:test.t1;
 let $diff_table_2=slave:test.t1;
 source include/diff_tables.inc;
@@ -368,8 +366,6 @@ INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
 sync_slave_with_master;
 
-sync_slave_with_master;
-
 let $diff_table_1=master:test.t2;
 let $diff_table_2=slave:test.t2;
 source include/diff_tables.inc;
@@ -399,8 +395,6 @@ INSERT INTO t4 VALUES (1, "", 1);
 INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
 sync_slave_with_master;
 
-sync_slave_with_master;
-
 let $diff_table_1=master:test.t4;
 let $diff_table_2=slave:test.t4;
 source include/diff_tables.inc;
@@ -449,8 +443,6 @@ INSERT INTO t7 VALUES (1, "", 1);
 INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
 sync_slave_with_master;
 
-sync_slave_with_master;
-
 let $diff_table_1=master:test.t7;
 let $diff_table_2=slave:test.t7;
 source include/diff_tables.inc;