summaryrefslogtreecommitdiff
path: root/mysql-test/t/delayed.test
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-12-16 11:13:58 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-12-16 11:13:58 +0100
commit33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (patch)
tree83c2beab0fb52424ab77dcb1449a3f394f0d0fe1 /mysql-test/t/delayed.test
parentdec388d5beac2e9d0d32ce1610b871c3d1042544 (diff)
parentcf175bf4b8fef9c054fa4779fbea011ad43432a0 (diff)
downloadmariadb-git-33827e7dbfc177ef52718f63eaf87e005ab3e8b5.tar.gz
Merge from mysql-5.5.8-release
Diffstat (limited to 'mysql-test/t/delayed.test')
-rw-r--r--mysql-test/t/delayed.test15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test
index 3a2bc982ad3..c47db78a11b 100644
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/t/delayed.test
@@ -539,6 +539,21 @@ connection con1;
--echo # Reaping: INSERT DELAYED INTO t1 VALUES (5)
--reap
+--echo # Connection default
+connection default;
+
+--echo # Test 5: LOCK TABLES + INSERT DELAYED in one connection.
+--echo # This test has triggered some asserts in metadata locking
+--echo # subsystem at some point in time..
+LOCK TABLE t1 WRITE;
+INSERT DELAYED INTO t2 VALUES (7);
+UNLOCK TABLES;
+SET AUTOCOMMIT= 0;
+LOCK TABLE t1 WRITE;
+INSERT DELAYED INTO t2 VALUES (8);
+UNLOCK TABLES;
+SET AUTOCOMMIT= 1;
+
--echo # Connection con2
connection con2;
disconnect con2;