summaryrefslogtreecommitdiff
path: root/mysql-test/main/lock.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/lock.test')
-rw-r--r--mysql-test/main/lock.test21
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/main/lock.test b/mysql-test/main/lock.test
index 2e164de9b93..2c2c5d42783 100644
--- a/mysql-test/main/lock.test
+++ b/mysql-test/main/lock.test
@@ -598,3 +598,24 @@ unlock tables;
disconnect con1;
connection default;
drop table t1;
+
+--echo #
+--echo # MDEV-15769: Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' failed in Diagnostics_area::set_ok_status
+--echo #
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (b INT);
+LOCK TABLE t1 READ;
+
+--connect (con1,localhost,root,,test)
+LOCK TABLE t2 WRITE;
+SET lock_wait_timeout= 1;
+--error ER_LOCK_WAIT_TIMEOUT
+FLUSH TABLES;
+
+# Cleanup
+UNLOCK TABLES;
+--disconnect con1
+--connection default
+UNLOCK TABLES;
+DROP TABLE t1, t2;
+