diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-23 12:54:58 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-23 12:54:58 +0100 |
| commit | b027d104382e1e1a2e69847a06d849032213f1d6 (patch) | |
| tree | 597fc443436c6ee13ba71d8d2b703bb51ff429cc /mysql-test/extra/rpl_tests/rpl_conflicts.test | |
| parent | 2c4f6e5c632f02880490191f5a8ea407f4d35ade (diff) | |
| parent | 8b3f9560200717a4f06be01e991f4c6ee4758504 (diff) | |
| download | mariadb-git-b027d104382e1e1a2e69847a06d849032213f1d6.tar.gz | |
Upmerge 11762407 (54999) with additions
Diffstat (limited to 'mysql-test/extra/rpl_tests/rpl_conflicts.test')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_conflicts.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_conflicts.test b/mysql-test/extra/rpl_tests/rpl_conflicts.test index ea3c053cb0e..2fbf3dba5dc 100644 --- a/mysql-test/extra/rpl_tests/rpl_conflicts.test +++ b/mysql-test/extra/rpl_tests/rpl_conflicts.test @@ -97,6 +97,7 @@ if (`SELECT @@global.binlog_format != 'ROW' OR @@global.slave_exec_mode = 'STRIC --disable_query_log --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)' --enable_query_log + call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062"); SELECT * FROM t1; @@ -142,6 +143,7 @@ connection slave; # replication continues. if (`SELECT @@global.binlog_format = 'ROW' AND @@global.slave_exec_mode = 'STRICT'`) { --echo ---- Wait until slave stops with an error ---- + call mtr.add_suppression("Slave SQL.*Can.t find record in .t1., Error_code: 1032"); let $slave_sql_errno= 1032; # ER_KEY_NOT_FOUND source include/wait_for_slave_sql_error.inc; |