summaryrefslogtreecommitdiff
path: root/mysql-test/main/kill.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-14 18:06:51 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-14 18:06:51 +0300
commit1d15a28e52e41fae0847284089b2073ab33162a5 (patch)
tree3d2dbd3ebda6547c26642e597b5cafc56e7ed031 /mysql-test/main/kill.test
parentc4feef50cfa4033e646636ed37e255d2b3593fbf (diff)
parenta20f6f9853e522ad388f5b968ce11af3c5d1fc10 (diff)
downloadmariadb-git-1d15a28e52e41fae0847284089b2073ab33162a5.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/kill.test')
-rw-r--r--mysql-test/main/kill.test20
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/main/kill.test b/mysql-test/main/kill.test
index 059d8d40b11..45d672aebc1 100644
--- a/mysql-test/main/kill.test
+++ b/mysql-test/main/kill.test
@@ -642,3 +642,23 @@ SET DEBUG_SYNC = 'RESET';
DROP FUNCTION MY_KILL;
set global sql_mode=default;
+
+--echo #
+--echo # MDEV-17998
+--echo # Deadlock and eventual Assertion `!table->pos_in_locked_tables' failed
+--echo # in tc_release_table on KILL_TIMEOUT
+--echo #
+
+SET max_statement_time= 2;
+
+CREATE TABLE t1 (a INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+CREATE TABLE t2 (b INT, c INT);
+
+LOCK TABLES v1 READ, t2 WRITE, t1 WRITE;
+--error ER_BAD_FIELD_ERROR,ER_STATEMENT_TIMEOUT
+ALTER TABLE t1 CHANGE f1 f2 DOUBLE;
+ALTER TABLE t2 DROP c;
+UNLOCK TABLES;
+DROP VIEW v1;
+DROP TABLE t1, t2;