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

[Andrei Elkin]

 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
 3301 Andrei Elkin	2011-06-17
      wl#5569 MTS
      
      fixing few tests.
      
      1. Policy is implemented for reacting with a warning in a case of failing worker leaves the total slave
      state with gaps thereby inconsistent.
      2. Two tests that were used to time out due to reset master/slave was disabled in there.
     @ mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
        a suppression is added.
     @ mysql-test/extra/rpl_tests/rpl_row_basic.test
        a suppression is added.
     @ mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
        a suppression is added.
     @ mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
        a suppression is added.
     @ mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
        a suppression is added.
     @ mysql-test/suite/rpl/r/rpl_row_event_max_size.result
        a suppression is added.
     @ mysql-test/suite/rpl/r/rpl_row_idempotency.result
        a suppression is added.
     @ mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
        a suppression is added.
     @ mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt
        removing unnecessary options causing test to fail.
     @ mysql-test/suite/rpl/t/rpl_parallel_benchmark.test
        removing an erronous assignment. The former disabling of reset was intended 
        for benchmarking w/o binlog on the slave to please master-slave.inc.
     @ mysql-test/suite/rpl/t/rpl_parallel_innodb-slave.opt
        removing unnecessary options causing test to fail.
     @ mysql-test/suite/rpl/t/rpl_parallel_innodb.test
        removing an erronous assignment. The former disabling of reset was intended 
        for benchmarking w/o binlog on the slave to please master-slave.inc.
     @ mysql-test/suite/rpl/t/rpl_row_event_max_size.test
        a suppression is added.
     @ mysql-test/suite/rpl/t/rpl_row_idempotency.test
        a suppression is added.
     @ sql/rpl_slave.cc
        Downgrading error to warning in a case of Coordinator fails due to a Worker error.
        Improving messages. Merging two if:s to have just one report().
     @ sql/share/errmsg-utf8.txt
        Improved the text of an error;
        Added a new error code.

    modified:
      mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      mysql-test/suite/rpl/r/rpl_row_idempotency.result
      mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
      mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_benchmark.test
      mysql-test/suite/rpl/t/rpl_parallel_innodb-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_innodb.test
      mysql-test/suite/rpl/t/rpl_row_event_max_size.test
      mysql-test/suite/rpl/t/rpl_row_idempotency.test
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
=== 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]