bzr push into mysql-5.1-rep+3 branch (sven.sandberg:3112 to 3113) Bug#39934

[Sven Sandberg]

 3113 Sven Sandberg	2009-10-19
      BUG#39934: Slave stops for engine that only support row-based logging
      Post-push fix.
      Problem: In a previous patch for BUG#39934, rpl_idempotency.test
      was split in two tests. The mtr suppressions in the original test
      did not make it into the new test. This caused pushbuild warnings.
      Fix: copy the mtr suppressions from rpl_idempotency.test to
      rpl_row_idempotency.test
     @ mysql-test/suite/rpl/r/rpl_row_idempotency.result
        updated result file
     @ mysql-test/suite/rpl/t/rpl_row_idempotency.test
        copied the warnings from rpl_idempotency.test to
        rpl_row_idempotency.test

    modified:
      mysql-test/suite/rpl/r/rpl_row_idempotency.result
      mysql-test/suite/rpl/t/rpl_row_idempotency.test
 3112 Sven Sandberg	2009-10-19
      BUG#39934 - post-push fixes.
      The rpl_ndb/combinations file was introduced as part of the fix.
      The file contained an error: ndb suites shall not run with
      binlog_format=mixed. Removed that combination.
     @ mysql-test/suite/rpl_ndb/combinations
        removed binlog_format=statement combination since ndb does not
        support statement format.
     @ mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
        Added have_binlog_format_mixed_or_row.inc.

    modified:
      mysql-test/suite/rpl_ndb/combinations
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
=== modified file 'mysql-test/suite/rpl/r/rpl_row_idempotency.result'
--- a/mysql-test/suite/rpl/r/rpl_row_idempotency.result	2009-07-14 19:31:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_idempotency.result	2009-10-19 13:12:59 +0000
@@ -4,6 +4,9 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+call mtr.add_suppression("Slave: Can't find record in 't.' Error_code: 1032");
+call mtr.add_suppression("Slave: Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
+call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
 set @old_slave_exec_mode= @@global.slave_exec_mode;
 set @@global.slave_exec_mode= IDEMPOTENT;
 create table ti1 (b int primary key) engine = innodb;

=== modified file 'mysql-test/suite/rpl/t/rpl_row_idempotency.test'
--- a/mysql-test/suite/rpl/t/rpl_row_idempotency.test	2009-07-14 19:31:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_idempotency.test	2009-10-19 13:12:59 +0000
@@ -8,6 +8,12 @@ source include/have_innodb.inc;
 connection slave;
 source include/have_innodb.inc;
 
+# Add suppression for expected warning(s) in slaves error log
+call mtr.add_suppression("Slave: Can't find record in 't.' Error_code: 1032");
+call mtr.add_suppression("Slave: Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
+call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
+
+
 # bug#31609 Not all RBR slave errors reported as errors
 # bug#31552 Replication breaks when deleting rows from out-of-sync table
 #           without PK


Attachment: [text/bzr-bundle] bzr/[e-mail]