Tokutek/mysql56#71 run mysql suite tokudb.bugs without tokudb as the default storage engine

32 files changed, 36 insertions, 23 deletions

diff --git a/mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result b/mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result
index 7ef86c9299f..dd517562a1b 100644
--- a/mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result
+++ b/mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result
@@ -1,3 +1,4 @@
+set default_storage_engine='tokudb';
 drop table if exists t;
 create table t (u tinytext, v text);
 insert into t values ('hi', 'there');
diff --git a/mysql-test/suite/tokudb.bugs/t/1913.test b/mysql-test/suite/tokudb.bugs/t/1913.test
index 036834d9451..18c8eb52ff9 100755
--- a/mysql-test/suite/tokudb.bugs/t/1913.test
+++ b/mysql-test/suite/tokudb.bugs/t/1913.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/1938.test b/mysql-test/suite/tokudb.bugs/t/1938.test
index 12d5eaef191..7d888bbaf34 100755
--- a/mysql-test/suite/tokudb.bugs/t/1938.test
+++ b/mysql-test/suite/tokudb.bugs/t/1938.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/1949.test b/mysql-test/suite/tokudb.bugs/t/1949.test
index d7efb0bc812..82deff17bc9 100755
--- a/mysql-test/suite/tokudb.bugs/t/1949.test
+++ b/mysql-test/suite/tokudb.bugs/t/1949.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2043.test b/mysql-test/suite/tokudb.bugs/t/2043.test
index 5b7c4a950ca..0a6e8b8e1e1 100755
--- a/mysql-test/suite/tokudb.bugs/t/2043.test
+++ b/mysql-test/suite/tokudb.bugs/t/2043.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2219.test b/mysql-test/suite/tokudb.bugs/t/2219.test
index 7502483382d..c61f4eca191 100755
--- a/mysql-test/suite/tokudb.bugs/t/2219.test
+++ b/mysql-test/suite/tokudb.bugs/t/2219.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2262.test b/mysql-test/suite/tokudb.bugs/t/2262.test
index 2dacfe9a2bf..c18d4ee4c19 100755
--- a/mysql-test/suite/tokudb.bugs/t/2262.test
+++ b/mysql-test/suite/tokudb.bugs/t/2262.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2383.test b/mysql-test/suite/tokudb.bugs/t/2383.test
index 12771ab5fbb..fa10de2f5ae 100644
--- a/mysql-test/suite/tokudb.bugs/t/2383.test
+++ b/mysql-test/suite/tokudb.bugs/t/2383.test
@@ -1,5 +1,5 @@
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2458.test b/mysql-test/suite/tokudb.bugs/t/2458.test
index 3b40e36e0b0..e6fc277e546 100755
--- a/mysql-test/suite/tokudb.bugs/t/2458.test
+++ b/mysql-test/suite/tokudb.bugs/t/2458.test
@@ -1,5 +1,5 @@
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2548.test b/mysql-test/suite/tokudb.bugs/t/2548.test
index 855f604b5fc..a6c012de0eb 100755
--- a/mysql-test/suite/tokudb.bugs/t/2548.test
+++ b/mysql-test/suite/tokudb.bugs/t/2548.test
@@ -1,5 +1,5 @@
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/2641.test b/mysql-test/suite/tokudb.bugs/t/2641.test
index a396db812df..a0f203c8149 100755
--- a/mysql-test/suite/tokudb.bugs/t/2641.test
+++ b/mysql-test/suite/tokudb.bugs/t/2641.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
diff --git a/mysql-test/suite/tokudb.bugs/t/2952.test b/mysql-test/suite/tokudb.bugs/t/2952.test
index 88e165f1587..255dd73f2d3 100755
--- a/mysql-test/suite/tokudb.bugs/t/2952.test
+++ b/mysql-test/suite/tokudb.bugs/t/2952.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --source include/not_5_5.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
diff --git a/mysql-test/suite/tokudb.bugs/t/2970.test b/mysql-test/suite/tokudb.bugs/t/2970.test
index 6335bb74119..e2d686322f9 100644
--- a/mysql-test/suite/tokudb.bugs/t/2970.test
+++ b/mysql-test/suite/tokudb.bugs/t/2970.test
@@ -1,3 +1,6 @@
+source include/have_tokudb.inc;
+set default_storage_engine='tokudb';
+
 # test that the query planner chooses a covering index over a non-covering index with the same
 # record cost
 
diff --git a/mysql-test/suite/tokudb.bugs/t/3014.test b/mysql-test/suite/tokudb.bugs/t/3014.test
index ff50b582ea8..e6f12eca825 100755
--- a/mysql-test/suite/tokudb.bugs/t/3014.test
+++ b/mysql-test/suite/tokudb.bugs/t/3014.test
@@ -1,4 +1,4 @@
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 #
 # Record inconsistency.
 #
diff --git a/mysql-test/suite/tokudb.bugs/t/3015.test b/mysql-test/suite/tokudb.bugs/t/3015.test
index e55340b810f..874d18c339f 100755
--- a/mysql-test/suite/tokudb.bugs/t/3015.test
+++ b/mysql-test/suite/tokudb.bugs/t/3015.test
@@ -1,4 +1,4 @@
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 #
 #test update multiple
 #
diff --git a/mysql-test/suite/tokudb.bugs/t/3083.test b/mysql-test/suite/tokudb.bugs/t/3083.test
index 58915fec360..883788f33fe 100755
--- a/mysql-test/suite/tokudb.bugs/t/3083.test
+++ b/mysql-test/suite/tokudb.bugs/t/3083.test
@@ -1,4 +1,4 @@
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 #
 #test update multiple
 #
diff --git a/mysql-test/suite/tokudb.bugs/t/4472.test b/mysql-test/suite/tokudb.bugs/t/4472.test
index e18beb9aca7..9eef8934732 100755
--- a/mysql-test/suite/tokudb.bugs/t/4472.test
+++ b/mysql-test/suite/tokudb.bugs/t/4472.test
@@ -1,6 +1,6 @@
 # test simple MVCC, that a transaction does not read something committed after it
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 
diff --git a/mysql-test/suite/tokudb.bugs/t/4656.test b/mysql-test/suite/tokudb.bugs/t/4656.test
index ea50fe2973e..98b3a8fb204 100644
--- a/mysql-test/suite/tokudb.bugs/t/4656.test
+++ b/mysql-test/suite/tokudb.bugs/t/4656.test
@@ -1,3 +1,4 @@
+source include/have_tokudb.inc;
 SET DEFAULT_STORAGE_ENGINE='tokudb';
 --disable_warnings
 DROP TABLE IF EXISTS t2;
diff --git a/mysql-test/suite/tokudb.bugs/t/4656_2.test b/mysql-test/suite/tokudb.bugs/t/4656_2.test
index 618f7f433b8..a65be6aec15 100644
--- a/mysql-test/suite/tokudb.bugs/t/4656_2.test
+++ b/mysql-test/suite/tokudb.bugs/t/4656_2.test
@@ -1,3 +1,4 @@
+source include/have_tokudb.inc;
 SET DEFAULT_STORAGE_ENGINE='tokudb';
 --disable_warnings
 DROP TABLE IF EXISTS t2;
diff --git a/mysql-test/suite/tokudb.bugs/t/5089.test b/mysql-test/suite/tokudb.bugs/t/5089.test
index 081c2245787..f3265d3ff39 100644
--- a/mysql-test/suite/tokudb.bugs/t/5089.test
+++ b/mysql-test/suite/tokudb.bugs/t/5089.test
@@ -1,3 +1,4 @@
+source include/have_tokudb.inc;
 let $engine='tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/5733_innodb.test b/mysql-test/suite/tokudb.bugs/t/5733_innodb.test
index dec1f39eb97..09d0162dfee 100644
--- a/mysql-test/suite/tokudb.bugs/t/5733_innodb.test
+++ b/mysql-test/suite/tokudb.bugs/t/5733_innodb.test
@@ -1,6 +1,6 @@
 # test that query planner selects range scan rather than full scan of the primary key
 # see ticket #5733
-
+source include/have_tokudb.inc;
 source include/have_innodb.inc;
 
 disable_warnings;
diff --git a/mysql-test/suite/tokudb.bugs/t/6053.test b/mysql-test/suite/tokudb.bugs/t/6053.test
index 5229c46db07..c628525acdd 100644
--- a/mysql-test/suite/tokudb.bugs/t/6053.test
+++ b/mysql-test/suite/tokudb.bugs/t/6053.test
@@ -1,3 +1,4 @@
+source include/have_tokudb.inc;
 # verify that the tokudb version string is appended to the mysql version
 replace_regex /[0-9]+\.[0-9]+\.[0-9]+[a-z0-9\-\.]*-tokudb-.*/NA.NA.NA-TOKUDB-NA/;
 select version();
diff --git a/mysql-test/suite/tokudb.bugs/t/6684.test b/mysql-test/suite/tokudb.bugs/t/6684.test
index ce9e462d353..63ddf752512 100644
--- a/mysql-test/suite/tokudb.bugs/t/6684.test
+++ b/mysql-test/suite/tokudb.bugs/t/6684.test
@@ -1,3 +1,4 @@
+--source include/have_tokudb.inc
 use test;
 
 drop table if exists site;
diff --git a/mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test b/mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test
index c4a2901b17b..32c894cb865 100644
--- a/mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test
+++ b/mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test
@@ -1,5 +1,6 @@
 # this test verifies that column expansion of a tinytext to text column retains the correct data
 --source include/have_tokudb.inc
+set default_storage_engine='tokudb';
 --disable_warnings
 drop table if exists t;
 --enable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/fileops-4.test b/mysql-test/suite/tokudb.bugs/t/fileops-4.test
index 49599f0652e..e7ca9304541 100755
--- a/mysql-test/suite/tokudb.bugs/t/fileops-4.test
+++ b/mysql-test/suite/tokudb.bugs/t/fileops-4.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --source include/not_5_5.inc
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);
diff --git a/mysql-test/suite/tokudb.bugs/t/ft-index-40.test b/mysql-test/suite/tokudb.bugs/t/ft-index-40.test
index f247164b6eb..56f7f787d6d 100644
--- a/mysql-test/suite/tokudb.bugs/t/ft-index-40.test
+++ b/mysql-test/suite/tokudb.bugs/t/ft-index-40.test
@@ -1,3 +1,4 @@
+--source include/have_tokudb.inc
 let $engine='tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/index_read.test b/mysql-test/suite/tokudb.bugs/t/index_read.test
index 6225aca7a02..b7820e5705f 100755
--- a/mysql-test/suite/tokudb.bugs/t/index_read.test
+++ b/mysql-test/suite/tokudb.bugs/t/index_read.test
@@ -1,6 +1,6 @@
 # ticket 895 is a query optimization problem with the primary key
 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test
index d931c897695..42dbb30058a 100644
--- a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test
+++ b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test
@@ -2,6 +2,7 @@
 
 source include/have_tokudb.inc;
 source include/have_partition.inc;
+set default_storage_engine='tokudb';
 
 # capture the datadir
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
@@ -32,7 +33,7 @@ EOF
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-create table tc (a int, b int, c int, primary key(a), key(b)) partition by hash(a) partitions 2;
+create table tc (a int, b int, c int, primary key(a), key(b)) engine=tokudb partition by hash(a) partitions 2;
 
 # check that the tokudb meta data gets dropped when the table is dropped
 select dictionary_name from information_schema.tokudb_file_map;
diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test
index 55cdfba5eb7..3903c2cef9f 100644
--- a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test
+++ b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test
@@ -1,6 +1,7 @@
 # verify that we can drop simple tokudb tables created in tokudb 6.6.8
 
 source include/have_tokudb.inc;
+set default_storage_engine='tokudb';
 
 # capture the datadir
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-1.test b/mysql-test/suite/tokudb.bugs/t/xa-1.test
index 4fd0dcd48d4..8914a20786c 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-1.test
+++ b/mysql-test/suite/tokudb.bugs/t/xa-1.test
@@ -1,5 +1,5 @@
--- source include/have_innodb.inc
--- source include/have_tokudb.inc
+--source include/have_innodb.inc
+--source include/have_tokudb.inc
 
 --disable_warnings
 drop table if exists t1, t2;
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-2.test b/mysql-test/suite/tokudb.bugs/t/xa-2.test
index 35adc359b3b..0edf905208d 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-2.test
+++ b/mysql-test/suite/tokudb.bugs/t/xa-2.test
@@ -1,4 +1,4 @@
--- source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --source include/not_5_5.inc
 
 --disable_warnings
diff --git a/mysql-test/suite/tokudb.bugs/t/xa-6.test b/mysql-test/suite/tokudb.bugs/t/xa-6.test
index ce3ad5e326b..b6f770f0a68 100644
--- a/mysql-test/suite/tokudb.bugs/t/xa-6.test
+++ b/mysql-test/suite/tokudb.bugs/t/xa-6.test
@@ -1,4 +1,4 @@
--- source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --source include/have_debug.inc
 
 --disable_warnings