List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:July 23 2008 2:34pm
Subject:bzr push into mysql-5.1 branch (sven:2674 to 2675) Bug#37733, Bug#37884
View as plain text  
 2675 Sven Sandberg	2008-07-23
      BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
      BUG#37884: rpl_row_basic_2myisam and rpl_row_basic_3innodb fail sporadically in pushbuild
      These have been fixed in 5.1-rpl. Re-applying fix for BUG#37884
      in 5.1-bugteam, and disabling rpl_flushlog_loop for BUG#37733 in
      5.1-bugteam.
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/suite/rpl/t/disabled.def

 2674 Davi Arnaut	2008-07-22
      Silence warning due to unused function.
modified:
  sql/field.cc

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-07-11 18:51:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test	2008-07-23 14:34:02 +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;

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-07-21 19:05:06 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-07-23 14:34:02 +0000
@@ -13,3 +13,4 @@
 rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)
 rpl_innodb_bug28430        : Failure on Solaris Bug #36793
 rpl_temporary              : BUG#38269 2008-07-21 Sven valgrind error in pushbuild
+rpl_flushlog_loop          : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main

Thread
bzr push into mysql-5.1 branch (sven:2674 to 2675) Bug#37733, Bug#37884Sven Sandberg23 Jul