summaryrefslogtreecommitdiff
path: root/mysql-test/t/myisam_debug.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-22 09:20:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-22 09:46:51 +0300
commit70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd (patch)
tree14d0c4dba49e36dc0d80c1ba99757b4074781d2d /mysql-test/t/myisam_debug.test
parent7edadde72eb23e9110db8cea810c023104e9d15e (diff)
parent13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff)
downloadmariadb-git-70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/t/myisam_debug.test')
-rw-r--r--mysql-test/t/myisam_debug.test13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/myisam_debug.test b/mysql-test/t/myisam_debug.test
index b106ecdea5e..465ecd70895 100644
--- a/mysql-test/t/myisam_debug.test
+++ b/mysql-test/t/myisam_debug.test
@@ -57,3 +57,16 @@ KILL QUERY @thread_id;
CHECK TABLE t1;
DROP TABLE t1,t2;
DISCONNECT insertConn;
+
+#
+# MDEV-12761 Error return from external_lock make the server crash
+#
+call mtr.add_suppression("Index for table '.*test.t1\\.MYI' is corrupt; try to repair it");
+create table t1 (a int, index(a));
+lock tables t1 write;
+insert t1 values (1),(2),(1);
+set @old_dbug=@@debug_dbug;
+set debug_dbug='+d,mi_lock_database_failure';
+unlock tables;
+set debug_dbug=@old_dbug;
+drop table t1;