Skip to content

Commit 30ddf96

Browse files
committed
Fixed ya main.flush_read_lock sporadic failure
Use different signal names, so that subsequent WAIT_FOR is not awaken by previous signal.
1 parent 29a0f5a commit 30ddf96

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

mysql-test/main/flush_read_lock.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,14 +1741,14 @@ CREATE DATABASE mysqltest;
17411741
CREATE TABLE mysqltest.t1(a INT);
17421742
HANDLER mysqltest.t1 OPEN as t1;
17431743
connect con1,localhost,root,,;
1744-
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready';
1744+
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready1';
17451745
LOCK TABLE mysqltest.t1 WRITE;
17461746
connect con2,localhost,root,,;
1747-
SET DEBUG_SYNC= 'now WAIT_FOR ready';
1748-
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready';
1747+
SET DEBUG_SYNC= 'now WAIT_FOR ready1';
1748+
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready2';
17491749
DROP DATABASE mysqltest;
17501750
connect con3,localhost,root,,;
1751-
SET DEBUG_SYNC= 'now WAIT_FOR ready';
1751+
SET DEBUG_SYNC= 'now WAIT_FOR ready2';
17521752
connection default;
17531753
FLUSH TABLES WITH READ LOCK;
17541754
connection con3;

mysql-test/main/flush_read_lock.test

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,15 +2106,16 @@ CREATE TABLE mysqltest.t1(a INT);
21062106
HANDLER mysqltest.t1 OPEN as t1;
21072107

21082108
connect (con1,localhost,root,,);
2109-
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready';
2109+
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready1';
21102110
--send LOCK TABLE mysqltest.t1 WRITE
2111+
21112112
connect (con2,localhost,root,,);
2112-
SET DEBUG_SYNC= 'now WAIT_FOR ready';
2113-
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready';
2113+
SET DEBUG_SYNC= 'now WAIT_FOR ready1';
2114+
SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready2';
21142115
--send DROP DATABASE mysqltest
21152116

21162117
connect (con3,localhost,root,,);
2117-
SET DEBUG_SYNC= 'now WAIT_FOR ready';
2118+
SET DEBUG_SYNC= 'now WAIT_FOR ready2';
21182119

21192120
connection default;
21202121
send FLUSH TABLES WITH READ LOCK;

0 commit comments

Comments
 (0)