summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-03-31 10:37:15 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2011-03-31 10:37:15 +0200
commita93d5306453209a4d3ca54c5fc285ec0c97730cc (patch)
tree50f4ff6505a0febefbefbea45bb233ffca4c644c /mysql-test/extra
parent89d96e3de9f8e8c4ff83c42d3615daf622280439 (diff)
parent997eb49e49077fe3f65cfdf488f1f8807ba4b311 (diff)
downloadmariadb-git-a93d5306453209a4d3ca54c5fc285ec0c97730cc.tar.gz
Small followup fix after MTR warning cleanup
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/rpl_tests/rpl_extra_col_master.test2
1 files changed, 2 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 45458a6cd6b..513bc949c5d 100644
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
@@ -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