summaryrefslogtreecommitdiff
path: root/mysql-test/extra/binlog_tests
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-02-23 12:54:58 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2011-02-23 12:54:58 +0100
commitfba6bdf989b3df619c7ea1c6d69c123df0eed7f4 (patch)
tree597fc443436c6ee13ba71d8d2b703bb51ff429cc /mysql-test/extra/binlog_tests
parent562978e1abaa7f2b073e6192173f009c358e8ac4 (diff)
parent1f9d8cd862a5a4599ebc141c2334b4661841d280 (diff)
downloadmariadb-git-fba6bdf989b3df619c7ea1c6d69c123df0eed7f4.tar.gz
Upmerge 11762407 (54999) with additions
Diffstat (limited to 'mysql-test/extra/binlog_tests')
-rw-r--r--mysql-test/extra/binlog_tests/binlog.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test
index 54aa08ff3ab..c0a8c3f6120 100644
--- a/mysql-test/extra/binlog_tests/binlog.test
+++ b/mysql-test/extra/binlog_tests/binlog.test
@@ -345,6 +345,7 @@ SHOW SESSION VARIABLES LIKE "%_checks";
--echo # INSERT INTO t1 VALUES(2)
--echo # foreign_key_checks=1 and unique_checks=1
--echo # It should not change current session's variables, even error happens
+call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062");
--error 1062
BINLOG '
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=