summaryrefslogtreecommitdiff
path: root/mysql-test/main/kill.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 19:28:51 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 19:28:51 +0300
commit65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (patch)
treef145a7a095011fbc4e6661e1675f72f6cdca38b6 /mysql-test/main/kill.result
parenteedd6179c1e5e8651270b353a693887179ad7bf3 (diff)
parented4ccf34a6603bd2374a721a7e1ad88472f335fc (diff)
downloadmariadb-git-65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5.tar.gz
Merge 10.2 to 10.3
Diffstat (limited to 'mysql-test/main/kill.result')
-rw-r--r--mysql-test/main/kill.result16
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/main/kill.result b/mysql-test/main/kill.result
index dc1cb9252da..e3fbb830df5 100644
--- a/mysql-test/main/kill.result
+++ b/mysql-test/main/kill.result
@@ -399,3 +399,19 @@ DROP USER u1@localhost;
SET DEBUG_SYNC = 'RESET';
DROP FUNCTION MY_KILL;
set global sql_mode=default;
+#
+# MDEV-17998
+# Deadlock and eventual Assertion `!table->pos_in_locked_tables' failed
+# in tc_release_table on KILL_TIMEOUT
+#
+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;
+ALTER TABLE t1 CHANGE f1 f2 DOUBLE;
+Got one of the listed errors
+ALTER TABLE t2 DROP c;
+UNLOCK TABLES;
+DROP VIEW v1;
+DROP TABLE t1, t2;