summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2018-10-13 18:47:16 +0300
committerElena Stepanova <elenst@montyprogram.com>2018-10-13 18:47:16 +0300
commit4d07e6c12da267758bed9e578922a9fc6260a543 (patch)
treedccd7c171df6be082c04d33c61a6e95a99bca8eb /storage/myisammrg
parent0f178e7cae4fed9a01d73a398c012fd0e62160f2 (diff)
downloadmariadb-git-4d07e6c12da267758bed9e578922a9fc6260a543.tar.gz
Disabled storage engine tests using LOCK with MERGE engine
Tests fail due to MDEV-17145
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/disabled.def2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/myisammrg/mysql-test/storage_engine/disabled.def b/storage/myisammrg/mysql-test/storage_engine/disabled.def
new file mode 100644
index 00000000000..ca25a5d331b
--- /dev/null
+++ b/storage/myisammrg/mysql-test/storage_engine/disabled.def
@@ -0,0 +1,2 @@
+lock : MDEV-17145 (Unexpected ER_LOCK_WAIT_TIMEOUT)
+select_high_prio : MDEV-17145 (Unexpected ER_LOCK_WAIT_TIMEOUT)