summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-10-16 18:40:31 +0300
committerMonty <monty@mariadb.org>2019-10-16 18:40:31 +0300
commit3ce14a66efc69a4ed9903ce121f5b0e9f469b12b (patch)
tree9f276ce95492bd911a38115567a17ab2d7bc368e /mysql-test/t
parent7952f7720f967b43873e4fac13583984803fae3b (diff)
downloadmariadb-git-3ce14a66efc69a4ed9903ce121f5b0e9f469b12b.tar.gz
Fixed bug in lock tables + alter table with Aria tables.
MDEV-18451 Server crashes in maria_create_trn_for_mysql upon ALTER TABLE Problem was that when table was locked many times, not all instances where removed from the transaction by _ma_remove_table_from_trnman()
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/kill.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index a188cee52f2..78de8a784f3 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -658,7 +658,7 @@ 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;
---error ER_STATEMENT_TIMEOUT
+--error 0,ER_STATEMENT_TIMEOUT
ALTER TABLE t2 DROP c;
UNLOCK TABLES;
DROP VIEW v1;