summaryrefslogtreecommitdiff
path: root/mysql-test/main/flush_read_lock.result
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@mariadb.com>2020-06-12 14:56:55 +0300
committerAndrei Elkin <andrei.elkin@mariadb.com>2020-06-12 14:56:55 +0300
commitefa67ee0ead018ee6dc7b26529253ffe82e5d5dc (patch)
tree8408be6d749c84435b05ac4eec1bfac6ce0950c4 /mysql-test/main/flush_read_lock.result
parent82f3ceed12063ac400a070b9c1972e139c59f385 (diff)
downloadmariadb-git-efa67ee0ead018ee6dc7b26529253ffe82e5d5dc.tar.gz
MDEV-21851: post-push to fix main.flush_read_lock.
Diffstat (limited to 'mysql-test/main/flush_read_lock.result')
-rw-r--r--mysql-test/main/flush_read_lock.result2
1 files changed, 1 insertions, 1 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.