diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2020-06-12 14:56:55 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2020-06-12 14:56:55 +0300 |
| commit | efa67ee0ead018ee6dc7b26529253ffe82e5d5dc (patch) | |
| tree | 8408be6d749c84435b05ac4eec1bfac6ce0950c4 /mysql-test/main | |
| parent | 82f3ceed12063ac400a070b9c1972e139c59f385 (diff) | |
| download | mariadb-git-efa67ee0ead018ee6dc7b26529253ffe82e5d5dc.tar.gz | |
MDEV-21851: post-push to fix main.flush_read_lock.
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/flush_read_lock.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/flush_read_lock.test | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result index f7fca14506e..9a81cae1724 100644 --- a/mysql-test/main/flush_read_lock.result +++ b/mysql-test/main/flush_read_lock.result @@ -49,6 +49,7 @@ set local sql_mode=""; # used in this test in order to be able to # check that DDL statements on temporary tables # are compatible with FTRWL. +call mtr.add_suppression("BINLOG_BASE64_EVENT: Error executing row event.*error code: 1223"); drop tables if exists t1_base, t2_base, t3_trans; drop tables if exists tm_base, tm_base_temp; drop database if exists mysqltest1; @@ -438,7 +439,6 @@ Success: Was able to run 'execute stmt1' under FTWRL. Success: Was able to run 'execute stmt1' with FTWRL active in another connection. Success: Was able to run FTWRL while 'execute stmt1' was active in another connection. deallocate prepare stmt1; -call mtr.add_suppression("Slave SQL.*Can.t execute the query because you have a conflicting read lock., error.* 1223"); # # 9.2.b) EXECUTE for statement which is incompatible with FTWRL # should be also incompatible. diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index 9d60aba58ba..205b8b302ea 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -65,6 +65,9 @@ set local sql_mode=""; --echo # used in this test in order to be able to --echo # check that DDL statements on temporary tables --echo # are compatible with FTRWL. + +call mtr.add_suppression("BINLOG_BASE64_EVENT: Error executing row event.*error code: 1223"); + --disable_warnings drop tables if exists t1_base, t2_base, t3_trans; drop tables if exists tm_base, tm_base_temp; @@ -300,7 +303,6 @@ set debug_sync= "RESET"; --echo # We don't run similar test for BEGIN and ROLLBACK as --echo # they release metadata locks in non-standard place. - --echo # --echo # 4) BINLOG statement should be incompatible with FTWRL. --echo # @@ -544,8 +546,6 @@ 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.* 1223"); - --echo # --echo # 9.2.b) EXECUTE for statement which is incompatible with FTWRL --echo # should be also incompatible. |