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

mysql-test/suite/tokudb.bugs/r/expand_tinytext_text.result

+set default_storage_engine='tokudb';
 drop table if exists t;
 create table t (u tinytext, v text);
 insert into t values ('hi', 'there');

mysql-test/suite/tokudb.bugs/t/1913.test

 # 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

mysql-test/suite/tokudb.bugs/t/1938.test

 # 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

mysql-test/suite/tokudb.bugs/t/1949.test

 # 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

mysql-test/suite/tokudb.bugs/t/2043.test

 # 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

mysql-test/suite/tokudb.bugs/t/2219.test

 # 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

mysql-test/suite/tokudb.bugs/t/2262.test

 # 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

mysql-test/suite/tokudb.bugs/t/2383.test

 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings

mysql-test/suite/tokudb.bugs/t/2458.test

 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings

mysql-test/suite/tokudb.bugs/t/2548.test

 
-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings

mysql-test/suite/tokudb.bugs/t/2641.test

 # 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';

mysql-test/suite/tokudb.bugs/t/2952.test

 # 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';
 

mysql-test/suite/tokudb.bugs/t/2970.test

+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
 

mysql-test/suite/tokudb.bugs/t/3014.test

-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 #
 # Record inconsistency.
 #

mysql-test/suite/tokudb.bugs/t/3015.test

-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 #
 #test update multiple
 #

mysql-test/suite/tokudb.bugs/t/3083.test

-#--source include/have_tokudb.inc
+--source include/have_tokudb.inc
 #
 #test update multiple
 #

mysql-test/suite/tokudb.bugs/t/4472.test

 # 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;
 

mysql-test/suite/tokudb.bugs/t/4656.test

+source include/have_tokudb.inc;
 SET DEFAULT_STORAGE_ENGINE='tokudb';
 --disable_warnings
 DROP TABLE IF EXISTS t2;

mysql-test/suite/tokudb.bugs/t/4656_2.test

+source include/have_tokudb.inc;
 SET DEFAULT_STORAGE_ENGINE='tokudb';
 --disable_warnings
 DROP TABLE IF EXISTS t2;

mysql-test/suite/tokudb.bugs/t/5089.test

+source include/have_tokudb.inc;
 let $engine='tokudb';
 
 --disable_warnings

mysql-test/suite/tokudb.bugs/t/5733_innodb.test

 # 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;

mysql-test/suite/tokudb.bugs/t/6053.test

+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();

mysql-test/suite/tokudb.bugs/t/6684.test

+--source include/have_tokudb.inc
 use test;
 
 drop table if exists site;

mysql-test/suite/tokudb.bugs/t/expand_tinytext_text.test

 # 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

mysql-test/suite/tokudb.bugs/t/fileops-4.test

 # 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,,);

mysql-test/suite/tokudb.bugs/t/ft-index-40.test

+--source include/have_tokudb.inc
 let $engine='tokudb';
 
 --disable_warnings

mysql-test/suite/tokudb.bugs/t/index_read.test

 # 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

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;

mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test

 # 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`;

mysql-test/suite/tokudb.bugs/t/xa-1.test

--- 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;

mysql-test/suite/tokudb.bugs/t/xa-2.test

--- source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --source include/not_5_5.inc
 
 --disable_warnings

mysql-test/suite/tokudb.bugs/t/xa-6.test

--- source include/have_tokudb.inc
+--source include/have_tokudb.inc
 --source include/have_debug.inc
 
 --disable_warnings