summaryrefslogtreecommitdiff
path: root/mysql-test/r/flush_table.result
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-08-03 02:01:27 +0400
committerunknown <evgen@moonbone.local>2005-08-03 02:01:27 +0400
commit5792c4d162e333698ca9596b52caebd30616fc00 (patch)
treee2a9588b41b4c49006fecb6c2137b5b620396a8f /mysql-test/r/flush_table.result
parent7246ca6ca971e1a9a09f6e7f7663f6b0ec21c8a1 (diff)
downloadmariadb-git-5792c4d162e333698ca9596b52caebd30616fc00.tar.gz
Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
Bug was introduced by cset 1.1659.14.1. Before it server was silently ignoring that lock can't be acquired because it already acquired. This patch makes make_global_read_lock_block_commit() return without error if lock already acquired. mysql-test/t/flush_table.test: Test case for bug#11934 FLUSH TABLES WITH READ LOCK hangs client. mysql-test/r/flush_table.result: Test case for bug#11934 FLUSH TABLES WITH READ LOCK hangs client. sql/lock.cc: Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client. Make make_global_read_lock_block_commit() return without error if lock already acquired.
Diffstat (limited to 'mysql-test/r/flush_table.result')
-rw-r--r--mysql-test/r/flush_table.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/flush_table.result b/mysql-test/r/flush_table.result
index 2ef4ab5b52b..db54d2e53ef 100644
--- a/mysql-test/r/flush_table.result
+++ b/mysql-test/r/flush_table.result
@@ -101,3 +101,6 @@ table_id
Record-02
handler t1 close;
drop table t1;
+FLUSH TABLES WITH READ LOCK ;
+FLUSH TABLES WITH READ LOCK ;
+UNLOCK TABLES;