summaryrefslogtreecommitdiff
path: root/storage/tokudb
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-08-04 04:27:33 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-08-04 04:27:33 +0300
commitd2a19082c03485c69157c7b1e040f2806eb2e153 (patch)
treeab458d0f565f2d5183b3204978001838e895f8a7 /storage/tokudb
parent8b0edbfb5efb07c3406101fd6ab4508edac4c06b (diff)
downloadmariadb-git-d2a19082c03485c69157c7b1e040f2806eb2e153.tar.gz
Disable rpl_tokudb_row_img_* testsbb-10.0-vicentiu-post-rewrite
We need to pull rpl config files from MySQL before these tests can be run.
Diffstat (limited to 'storage/tokudb')
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf1
-rw-r--r--storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test1
14 files changed, 7 insertions, 7 deletions
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test
index a52e96dc19d..ff4a0435a5e 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
--source include/no_valgrind_without_big.inc
-- source include/have_innodb.inc
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test
index cfbc6519182..68ff71752ac 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
-- source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096 and bug fixes.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test
index 4c832208feb..3ba958fc691 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
-- source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096 and bug fixes.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test
index 00b6448ad72..f539e3ac370 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
-- source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096 and bug fixes.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test
index 6f683776c3c..9dfd1675f53 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
-- source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test
index 030bc655291..03e022940a6 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
--source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096.
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf
deleted file mode 100644
index d758d29f481..00000000000
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.cnf
+++ /dev/null
@@ -1 +0,0 @@
-!include suite/rpl/t/rpl_row_img.cnf
diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test
index 785f79bccdc..ed147c8902b 100644
--- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test
+++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test
@@ -1,4 +1,5 @@
#Want to skip this test from daily Valgrind execution
+skip Require rpl files from MySQL;
-- source include/no_valgrind_without_big.inc
#
# This file contains tests for WL#5096.