mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-21851: post-push to fix main.flush_read_lock.

Browse source
This commit is contained in:
Andrei Elkin 2020-06-12 14:56:55 +03:00
parent 82f3ceed12
commit efa67ee0ea
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/main/flush_read_lock.result
View file

@ -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.

6
mysql-test/main/flush_read_lock.test
View file

@ -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.