Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
efa67ee0
Commit
efa67ee0
authored
Jun 12, 2020
by
Andrei Elkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-21851: post-push to fix main.flush_read_lock.
parent
82f3ceed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mysql-test/main/flush_read_lock.result
mysql-test/main/flush_read_lock.result
+1
-1
mysql-test/main/flush_read_lock.test
mysql-test/main/flush_read_lock.test
+3
-3
No files found.
mysql-test/main/flush_read_lock.result
View file @
efa67ee0
...
@@ -49,6 +49,7 @@ set local sql_mode="";
...
@@ -49,6 +49,7 @@ set local sql_mode="";
# used in this test in order to be able to
# used in this test in order to be able to
# check that DDL statements on temporary tables
# check that DDL statements on temporary tables
# are compatible with FTRWL.
# 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 t1_base, t2_base, t3_trans;
drop tables if exists tm_base, tm_base_temp;
drop tables if exists tm_base, tm_base_temp;
drop database if exists mysqltest1;
drop database if exists mysqltest1;
...
@@ -438,7 +439,6 @@ Success: Was able to run 'execute stmt1' under FTWRL.
...
@@ -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 'execute stmt1' with FTWRL active in another connection.
Success: Was able to run FTWRL while 'execute stmt1' was active in another connection.
Success: Was able to run FTWRL while 'execute stmt1' was active in another connection.
deallocate prepare stmt1;
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
# 9.2.b) EXECUTE for statement which is incompatible with FTWRL
# should be also incompatible.
# should be also incompatible.
...
...
mysql-test/main/flush_read_lock.test
View file @
efa67ee0
...
@@ -65,6 +65,9 @@ set local sql_mode="";
...
@@ -65,6 +65,9 @@ set local sql_mode="";
--
echo
# used in this test in order to be able to
--
echo
# used in this test in order to be able to
--
echo
# check that DDL statements on temporary tables
--
echo
# check that DDL statements on temporary tables
--
echo
# are compatible with FTRWL.
--
echo
# are compatible with FTRWL.
call
mtr
.
add_suppression
(
"BINLOG_BASE64_EVENT: Error executing row event.*error code: 1223"
);
--
disable_warnings
--
disable_warnings
drop
tables
if
exists
t1_base
,
t2_base
,
t3_trans
;
drop
tables
if
exists
t1_base
,
t2_base
,
t3_trans
;
drop
tables
if
exists
tm_base
,
tm_base_temp
;
drop
tables
if
exists
tm_base
,
tm_base_temp
;
...
@@ -300,7 +303,6 @@ set debug_sync= "RESET";
...
@@ -300,7 +303,6 @@ set debug_sync= "RESET";
--
echo
# We don't run similar test for BEGIN and ROLLBACK as
--
echo
# We don't run similar test for BEGIN and ROLLBACK as
--
echo
# they release metadata locks in non-standard place.
--
echo
# they release metadata locks in non-standard place.
--
echo
#
--
echo
#
--
echo
# 4) BINLOG statement should be incompatible with FTWRL.
--
echo
# 4) BINLOG statement should be incompatible with FTWRL.
--
echo
#
--
echo
#
...
@@ -544,8 +546,6 @@ let $cleanup_stmt= ;
...
@@ -544,8 +546,6 @@ let $cleanup_stmt= ;
--
source
include
/
check_ftwrl_compatible
.
inc
--
source
include
/
check_ftwrl_compatible
.
inc
deallocate
prepare
stmt1
;
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
#
--
echo
# 9.2.b) EXECUTE for statement which is incompatible with FTWRL
--
echo
# 9.2.b) EXECUTE for statement which is incompatible with FTWRL
--
echo
# should be also incompatible.
--
echo
# should be also incompatible.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment