bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3302) WL#5569

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3302 Andrei Elkin	2011-06-17
      wl#5569 MTS
      
      fixing rpl_row_basic_3innodb similarly to the previous patch.
     @ mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
        a suppression is added.

    modified:
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2011-06-17 11:00:41 +0000
@@ -484,6 +484,7 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @sav
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/rpl_reset.inc
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);


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