diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /mysql-test/extra/rpl_tests/rpl_extra_col_master.test | |
| parent | 355e250544e69df7b547d8950bc9febfc5668be6 (diff) | |
| parent | 82b49178600e3b21f378bef71b8f9e81bc7bcd3a (diff) | |
| download | mariadb-git-ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59.tar.gz | |
Merge with MariaDB 5.2
Diffstat (limited to 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_extra_col_master.test | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test index eb50149655e..1c103512318 100644 --- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test +++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test @@ -121,6 +121,16 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9, hex(f10),hex(f11) FROM t1 ORDER BY f3 LIMIT 20; #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 I/O: Get master clock failed with error:.* Error_code: 2013"); +call mtr.add_suppression("Slave I/O: Get master SERVER_ID failed with error:.* Error_code: 2013"); +--enable_query_log + sync_slave_with_master; --echo --echo * Select count and 20 rows from Slave * |