summaryrefslogtreecommitdiff
path: root/storage/tokudb/mysql-test/tokudb_bugs/t
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-05-17 16:19:01 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-05-17 16:19:22 +0300
commit3670d167a6261a867b8a5e64028e7b580ca5991a (patch)
tree99b368dcce8228a94336c32c9178d1df76960bc3 /storage/tokudb/mysql-test/tokudb_bugs/t
parent5fe55b1b0251a894d87488d7dc973b044af12736 (diff)
downloadmariadb-git-3670d167a6261a867b8a5e64028e7b580ca5991a.tar.gz
Fix tokudb test failures post merge
Diffstat (limited to 'storage/tokudb/mysql-test/tokudb_bugs/t')
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db938.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/db945.test1
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test1
6 files changed, 6 insertions, 0 deletions
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
index 79043664607..7343768a7d7 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
# check for any locking weirdness on DELETE triggers
source include/have_tokudb.inc;
set default_storage_engine='tokudb';
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test
index ffe2face9f2..313b1f96b52 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
# check for any locking weirdness on INSERT triggers
source include/have_tokudb.inc;
set default_storage_engine='tokudb';
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test
index 063a88cb4ab..ce1eb6bddd1 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test
@@ -1,3 +1,4 @@
+skip Tokudb Lock Waits not in I_S in MariaDB;
# check for any locking weirdness on UPDATE triggers
source include/have_tokudb.inc;
set default_storage_engine='tokudb';
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db938.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db938.test
index 50434a79a00..d65bf3d95de 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db938.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db938.test
@@ -1,3 +1,4 @@
+skip Background Job Manager not supported in MariaDB;
# This test for DB-938 tests a race condition where a scheduled background job
# (analyze) ends up operating on a set of DB* key_file[] in TOKUDB_SHARE that
# were set to NULL during a TRUNCATE TABLE operation.
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
index 27b0d284484..7996f9f5792 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/db945.test
@@ -1,3 +1,4 @@
+skip Background Job Manager not supported in MariaDB;
source include/have_tokudb.inc;
set default_storage_engine='tokudb';
disable_warnings;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
index 735a88afed8..e7ef3211401 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
@@ -1,3 +1,4 @@
+skip Tokudb Fractal Tree info not in I_S in MariaDB;
# test DB-718, a crash caused by broken error handling in tokudb's fractal_tree_info information schema
source include/have_tokudb.inc;
set default_storage_engine='tokudb';