summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2015-01-21 14:02:26 +0100
committerSergei Golubchik <sergii@pisem.net>2015-01-21 14:02:26 +0100
commitff55d900fbeb1d426e7737caef6748c3f13bf4e6 (patch)
treee2bdecad651f7e77eab9bd1af11751d300049d4a /storage
parentd9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840 (diff)
downloadmariadb-git-ff55d900fbeb1d426e7737caef6748c3f13bf4e6.tar.gz
after-merge fixes
Diffstat (limited to 'storage')
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/disabled.def3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
index 0bf13a5e86e..86d38a530da 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
@@ -9,3 +9,6 @@ fileops-3: how this could work, if alter needs an exclusive mdl lock?
checkpoint_lock_2: test can not work when the checkpoint_safe_lock is a fair rwlock
+# this test was added in 7.5.4 and fails in 10.0
+# but running this very test in 7.5.3 fails in exactly the same manner
+db768: never worked. tokutek was informed, 2015-01-14