summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/suite/archive/disabled.def12
-rw-r--r--storage/connect/mysql-test/connect/disabled.def4
-rw-r--r--storage/tokudb/mysql-test/tokudb/disabled.def7
-rw-r--r--storage/tokudb/mysql-test/tokudb_bugs/disabled.def7
4 files changed, 29 insertions, 1 deletions
diff --git a/mysql-test/suite/archive/disabled.def b/mysql-test/suite/archive/disabled.def
new file mode 100644
index 00000000000..1aeb519e763
--- /dev/null
+++ b/mysql-test/suite/archive/disabled.def
@@ -0,0 +1,12 @@
+##############################################################################
+#
+# List the test cases that are to be disabled temporarily.
+#
+# Separate the test case name and the comment with ':'.
+#
+# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+# Do not use any TAB characters for whitespace.
+#
+##############################################################################
+archive-big: versioning branch \ No newline at end of file
diff --git a/storage/connect/mysql-test/connect/disabled.def b/storage/connect/mysql-test/connect/disabled.def
index 0e5a5fc64e3..c5cd5402a16 100644
--- a/storage/connect/mysql-test/connect/disabled.def
+++ b/storage/connect/mysql-test/connect/disabled.def
@@ -16,3 +16,7 @@ jdbc_postgresql : Variable settings depend on machine configuration
json : TABLE_TYPE = JSON conflicts with the SQL syntax
json_udf : conflicts with the server JSON functions
json_udf_bin : conflicts with the server JSON functions
+
+mrr: versioning branch
+index: versioning branch
+mysql_index: versioning branch \ No newline at end of file
diff --git a/storage/tokudb/mysql-test/tokudb/disabled.def b/storage/tokudb/mysql-test/tokudb/disabled.def
index 1f5ed441254..0a62e8b136c 100644
--- a/storage/tokudb/mysql-test/tokudb/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb/disabled.def
@@ -31,4 +31,9 @@ i_s_tokudb_locks_released: unstable, race conditions
row_format: n/a
rows-32m-rand-insert: versioning branch
-rows-32m-seq-insert: versioning branch \ No newline at end of file
+rows-32m-seq-insert: versioning branch
+background_job_manager: versioning branch
+i_s_tokudb_lock_waits_timeout: versioning branch
+i_s_tokudb_locks: versioning branch
+i_s_tokudb_trx: versioning branch
+card_auto_analyze_lots: versioning branch \ No newline at end of file
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
index d0d1a47e006..a9d35d5f751 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_bugs/disabled.def
@@ -1,2 +1,9 @@
5585: times out, too many huge insert...selects
db233: different execution path in mariadb, debug_sync point is not hit
+
+db397_insert_trigger: versioning branch
+db397_delete_trigger: versioning branch
+db397_update_trigger: versioning branch
+db938: versioning branch
+tokudb718: versioning branch
+db945: versioning branch \ No newline at end of file