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/t/flush_read_lock.test | |
| parent | 2c4f6e5c632f02880490191f5a8ea407f4d35ade (diff) | |
| parent | 8b3f9560200717a4f06be01e991f4c6ee4758504 (diff) | |
| download | mariadb-git-b027d104382e1e1a2e69847a06d849032213f1d6.tar.gz | |
Upmerge 11762407 (54999) with additions
Diffstat (limited to 'mysql-test/t/flush_read_lock.test')
| -rw-r--r-- | mysql-test/t/flush_read_lock.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/flush_read_lock.test b/mysql-test/t/flush_read_lock.test index dbb1dd7cb49..9da93dd40a1 100644 --- a/mysql-test/t/flush_read_lock.test +++ b/mysql-test/t/flush_read_lock.test @@ -557,6 +557,8 @@ let $cleanup_stmt= ; --source include/check_ftwrl_compatible.inc deallocate prepare stmt1; +call mtr.add_suppression("Slave SQL.*Can.t execute the query because you have a conflicting read lock., Error_code: 1223"); + --echo # --echo # 9.2.b) EXECUTE for statement which is incompatible with FTWRL --echo # should be also incompatible. |