Skip to content

Commit

Permalink
MDEV-21851: post-push to fix main.flush_read_lock.
Browse files Browse the repository at this point in the history
  • Loading branch information
andrelkin committed Jun 12, 2020
1 parent 82f3cee commit efa67ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mysql-test/main/flush_read_lock.result
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/main/flush_read_lock.test
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ set local sql_mode="";
--echo # used in this test in order to be able to

This comment has been minimized.

Copy link
@andrelkin

andrelkin Jun 13, 2020

Author Contributor

???.

--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;
Expand Down Expand Up @@ -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.


This comment has been minimized.

Copy link
@andrelkin

andrelkin Jun 15, 2020

Author Contributor

Test: why error to submit?

--echo #
--echo # 4) BINLOG statement should be incompatible with FTWRL.
--echo #
Expand Down Expand Up @@ -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");

This comment has been minimized.

Copy link
@andrelkin

andrelkin Jun 13, 2020

Author Contributor

??? + ??? = ???

--echo #
--echo # 9.2.b) EXECUTE for statement which is incompatible with FTWRL
--echo # should be also incompatible.
Expand Down

3 comments on commit efa67ee

@andrelkin
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Top-level comment 0 ?
Top-level comment 1 ?

@andrelkin
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disregard. Test.

@andrelkin
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disregard. Test3.

Please sign in to comment.