From: Bjorn Munch Date: March 31 2011 8:40am Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3053) List-Archive: http://lists.mysql.com/commits/134341 Message-Id: <201103310840.p2V8ecwQ014577@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped 3053 Bjorn Munch 2011-03-31 [merge] Small followup fix after MTR warning cleanup modified: mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result === modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test' --- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-03-30 13:33:29 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-03-31 08:39:55 +0000 @@ -122,11 +122,13 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9, #connection slave; +--disable_query_log call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677"); +--enable_query_log sync_slave_with_master; --echo === modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result' --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-03-30 13:33:29 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-03-31 08:39:55 +0000 @@ -57,11 +57,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); -call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677"); * Select count and 20 rows from Slave * === modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result' --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-03-30 13:33:29 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-03-31 08:39:55 +0000 @@ -57,11 +57,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); -call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677"); * Select count and 20 rows from Slave * No bundle (reason: revision is a merge).