summaryrefslogtreecommitdiff
path: root/mysql-test/r/mdl_sync.result
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2009-12-10 15:09:56 +0100
committerJon Olav Hauglid <jon.hauglid@sun.com>2009-12-10 15:09:56 +0100
commit94154c9592e8a4b1eb9ee19529ab22f1f07a3e26 (patch)
tree0d2b36302950e0d9f841ff7ce7477c283aa3fb47 /mysql-test/r/mdl_sync.result
parent3d062adf2526fa7f92ed15dfb9525e4d9ba5e9f2 (diff)
downloadmariadb-git-94154c9592e8a4b1eb9ee19529ab22f1f07a3e26.tar.gz
Backport of revno: 3690
Postfix for Bug#48210 FLUSH TABLES WITH READ LOCK deadlocks against concurrent CREATE PROCEDURE Rewrote the second test to use DROP PROCEDURE instead of CREATE USER as CREATE USER does not work with embedded server.
Diffstat (limited to 'mysql-test/r/mdl_sync.result')
-rw-r--r--mysql-test/r/mdl_sync.result10
1 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/r/mdl_sync.result b/mysql-test/r/mdl_sync.result
index 130a8f22710..ec02f29b008 100644
--- a/mysql-test/r/mdl_sync.result
+++ b/mysql-test/r/mdl_sync.result
@@ -273,21 +273,19 @@ FLUSH TABLES WITH READ LOCK;
# Connection 2
UNLOCK TABLES;
# Connection 1
-DROP PROCEDURE p1;
SET DEBUG_SYNC= 'RESET';
-# Test 2: CREATE USER
-# Start CREATE USER and open the grant tables
+# Test 2: DROP PROCEDURE
+# Start DROP PROCEDURE and open tables
SET DEBUG_SYNC= 'after_open_table_mdl_shared SIGNAL table_opened WAIT_FOR grlwait';
-CREATE USER 'user_1@localhost';
+DROP PROCEDURE p1;
# Connection 2
SET DEBUG_SYNC= 'now WAIT_FOR table_opened';
# Check that FLUSH must wait to get the GRL
-# and let CREATE USER continue
+# and let DROP PROCEDURE continue
SET DEBUG_SYNC= 'wait_lock_global_read_lock SIGNAL grlwait';
FLUSH TABLES WITH READ LOCK;
# Connection 1
# Connection 2
UNLOCK TABLES;
# Connection 1
-DROP USER 'user_1@localhost';
SET DEBUG_SYNC= 'RESET';