From 30ddf961130aa4f4794cc97ced2f4122b456c65c Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Tue, 14 May 2019 23:47:12 +0400 Subject: [PATCH] Fixed ya main.flush_read_lock sporadic failure Use different signal names, so that subsequent WAIT_FOR is not awaken by previous signal. --- mysql-test/main/flush_read_lock.result | 8 ++++---- mysql-test/main/flush_read_lock.test | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mysql-test/main/flush_read_lock.result b/mysql-test/main/flush_read_lock.result index bd3b750f59e..db92344cfbd 100644 --- a/mysql-test/main/flush_read_lock.result +++ b/mysql-test/main/flush_read_lock.result @@ -1741,14 +1741,14 @@ CREATE DATABASE mysqltest; CREATE TABLE mysqltest.t1(a INT); HANDLER mysqltest.t1 OPEN as t1; connect con1,localhost,root,,; -SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready'; +SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready1'; LOCK TABLE mysqltest.t1 WRITE; connect con2,localhost,root,,; -SET DEBUG_SYNC= 'now WAIT_FOR ready'; -SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready'; +SET DEBUG_SYNC= 'now WAIT_FOR ready1'; +SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready2'; DROP DATABASE mysqltest; connect con3,localhost,root,,; -SET DEBUG_SYNC= 'now WAIT_FOR ready'; +SET DEBUG_SYNC= 'now WAIT_FOR ready2'; connection default; FLUSH TABLES WITH READ LOCK; connection con3; diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index ab30cacada8..80512deac4e 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -2106,15 +2106,16 @@ CREATE TABLE mysqltest.t1(a INT); HANDLER mysqltest.t1 OPEN as t1; connect (con1,localhost,root,,); -SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready'; +SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready1'; --send LOCK TABLE mysqltest.t1 WRITE + connect (con2,localhost,root,,); -SET DEBUG_SYNC= 'now WAIT_FOR ready'; -SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready'; +SET DEBUG_SYNC= 'now WAIT_FOR ready1'; +SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready2'; --send DROP DATABASE mysqltest connect (con3,localhost,root,,); -SET DEBUG_SYNC= 'now WAIT_FOR ready'; +SET DEBUG_SYNC= 'now WAIT_FOR ready2'; connection default; send FLUSH TABLES WITH READ LOCK;