diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-01-18 15:57:10 -0500 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-01-18 15:57:10 -0500 |
| commit | 94cb0748e3ed4b694c63777c18bc4505431a0098 (patch) | |
| tree | f3b0acd5ca4cb4ae67e10f45a9e417f0734fdff9 /mysql-test | |
| parent | 0bb3ea42061549f9919f82de141f992bc59fccf3 (diff) | |
| download | mariadb-git-94cb0748e3ed4b694c63777c18bc4505431a0098.tar.gz | |
Tokutek/mysql56#71 run mysql suite tokudb without tokudb as the default storage engine
Diffstat (limited to 'mysql-test')
163 files changed, 165 insertions, 67 deletions
diff --git a/mysql-test/suite/tokudb/t/auto_increment.test b/mysql-test/suite/tokudb/t/auto_increment.test index f03a78d000f..595c4d14600 100644 --- a/mysql-test/suite/tokudb/t/auto_increment.test +++ b/mysql-test/suite/tokudb/t/auto_increment.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # # Test of auto_increment; The test for BDB tables is in bdb.test # diff --git a/mysql-test/suite/tokudb/t/auto_increment_boundary.test b/mysql-test/suite/tokudb/t/auto_increment_boundary.test index 15db7607c8c..4cccc29d386 100644 --- a/mysql-test/suite/tokudb/t/auto_increment_boundary.test +++ b/mysql-test/suite/tokudb/t/auto_increment_boundary.test @@ -1,3 +1,5 @@ +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/t/auto_increment_boundary_traditional.test b/mysql-test/suite/tokudb/t/auto_increment_boundary_traditional.test index f32e8215c16..2e73cf4a53d 100644 --- a/mysql-test/suite/tokudb/t/auto_increment_boundary_traditional.test +++ b/mysql-test/suite/tokudb/t/auto_increment_boundary_traditional.test @@ -1,3 +1,5 @@ +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/t/bulk-fetch.test b/mysql-test/suite/tokudb/t/bulk-fetch.test index 7df722e7b24..46b1ea106a3 100644 --- a/mysql-test/suite/tokudb/t/bulk-fetch.test +++ b/mysql-test/suite/tokudb/t/bulk-fetch.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Tokutek # Test that bulk fetch works with various table types diff --git a/mysql-test/suite/tokudb/t/bulk-fetch2.test b/mysql-test/suite/tokudb/t/bulk-fetch2.test index 38ad76832ff..2afe959537f 100644 --- a/mysql-test/suite/tokudb/t/bulk-fetch2.test +++ b/mysql-test/suite/tokudb/t/bulk-fetch2.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Tokutek # Test that bulk fetch works with various table types diff --git a/mysql-test/suite/tokudb/t/change_column_all_1000_1.test b/mysql-test/suite/tokudb/t/change_column_all_1000_1.test index de002969357..2e863d97af4 100644 --- a/mysql-test/suite/tokudb/t/change_column_all_1000_1.test +++ b/mysql-test/suite/tokudb/t/change_column_all_1000_1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # generated from change_column_all.py # test random column change on wide tables --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_all_1000_10.test b/mysql-test/suite/tokudb/t/change_column_all_1000_10.test index 1b7e2e91f09..4fa8409aaae 100644 --- a/mysql-test/suite/tokudb/t/change_column_all_1000_10.test +++ b/mysql-test/suite/tokudb/t/change_column_all_1000_10.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # generated from change_all.py # test random column change on wide tables --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_auto_inc.test b/mysql-test/suite/tokudb/t/change_column_auto_inc.test index a8385fa5fcf..c554f622111 100644 --- a/mysql-test/suite/tokudb/t/change_column_auto_inc.test +++ b/mysql-test/suite/tokudb/t/change_column_auto_inc.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_bin.test b/mysql-test/suite/tokudb/t/change_column_bin.test index 6d502a08567..0365c155302 100644 --- a/mysql-test/suite/tokudb/t/change_column_bin.test +++ b/mysql-test/suite/tokudb/t/change_column_bin.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_bin.py # test binary expansion is hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_bin_descriptor.test b/mysql-test/suite/tokudb/t/change_column_bin_descriptor.test index 6e2f77fd4af..bda62ab3646 100644 --- a/mysql-test/suite/tokudb/t/change_column_bin_descriptor.test +++ b/mysql-test/suite/tokudb/t/change_column_bin_descriptor.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t, ti; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_bin_key.test b/mysql-test/suite/tokudb/t/change_column_bin_key.test index 4b93e793613..c486f60b0a7 100644 --- a/mysql-test/suite/tokudb/t/change_column_bin_key.test +++ b/mysql-test/suite/tokudb/t/change_column_bin_key.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that expansion of a binary field in a key is not supported --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_bin_pad.test b/mysql-test/suite/tokudb/t/change_column_bin_pad.test index 397e5f02271..11ad567d3ac 100644 --- a/mysql-test/suite/tokudb/t/change_column_bin_pad.test +++ b/mysql-test/suite/tokudb/t/change_column_bin_pad.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that binary pad is zero --disable_warnings DROP TABLE IF EXISTS s,t; diff --git a/mysql-test/suite/tokudb/t/change_column_bin_rename.test b/mysql-test/suite/tokudb/t/change_column_bin_rename.test index 87a182ef254..fc978cbf2e4 100644 --- a/mysql-test/suite/tokudb/t/change_column_bin_rename.test +++ b/mysql-test/suite/tokudb/t/change_column_bin_rename.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_char_rename.py # test char expansion + rename is hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_blob.test b/mysql-test/suite/tokudb/t/change_column_blob.test index 52383dcfb46..585c943766f 100644 --- a/mysql-test/suite/tokudb/t/change_column_blob.test +++ b/mysql-test/suite/tokudb/t/change_column_blob.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_blob.py # generate hot blob expansion test cases --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char.test b/mysql-test/suite/tokudb/t/change_column_char.test index eff3d8428ba..8a0b0a9abd8 100644 --- a/mysql-test/suite/tokudb/t/change_column_char.test +++ b/mysql-test/suite/tokudb/t/change_column_char.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_char.py # test char expansion --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_binary.test b/mysql-test/suite/tokudb/t/change_column_char_binary.test index c42ad085a79..e30e7044f4a 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_binary.test +++ b/mysql-test/suite/tokudb/t/change_column_char_binary.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_char_binary.py # test that char(X) <-> binary(X) is not hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_charbinary.test b/mysql-test/suite/tokudb/t/change_column_char_charbinary.test index bc4abe8594c..31ab487fe02 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_charbinary.test +++ b/mysql-test/suite/tokudb/t/change_column_char_charbinary.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_char_charbinary.py # test that char(X) <-> char(X) binary is not hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_charset.test b/mysql-test/suite/tokudb/t/change_column_char_charset.test index 6b9a1492592..c1656b00695 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_charset.test +++ b/mysql-test/suite/tokudb/t/change_column_char_charset.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that char change with different charset is not hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_default.test b/mysql-test/suite/tokudb/t/change_column_char_default.test index da383090f97..e4fd32b7148 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_default.test +++ b/mysql-test/suite/tokudb/t/change_column_char_default.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that char expansion + default change works --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_descriptor.test b/mysql-test/suite/tokudb/t/change_column_char_descriptor.test index d57b69c3288..ddfd2027bd4 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_descriptor.test +++ b/mysql-test/suite/tokudb/t/change_column_char_descriptor.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t, ti; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_key.test b/mysql-test/suite/tokudb/t/change_column_char_key.test index 263028fdd34..c1d8a2b496b 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_key.test +++ b/mysql-test/suite/tokudb/t/change_column_char_key.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that expansion of a char field in a key is not supported --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_null.test b/mysql-test/suite/tokudb/t/change_column_char_null.test index cc97b370ed2..1aec846dc79 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_null.test +++ b/mysql-test/suite/tokudb/t/change_column_char_null.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that char(X) to char(Y) not null is not supported (different type) --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_char_rename.test b/mysql-test/suite/tokudb/t/change_column_char_rename.test index 144faa6d7d9..03a87d7378e 100644 --- a/mysql-test/suite/tokudb/t/change_column_char_rename.test +++ b/mysql-test/suite/tokudb/t/change_column_char_rename.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_char_rename.py # test char expansion + rename is hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_int.test b/mysql-test/suite/tokudb/t/change_column_int.test index 17eece7ed6a..27e609def63 100644 --- a/mysql-test/suite/tokudb/t/change_column_int.test +++ b/mysql-test/suite/tokudb/t/change_column_int.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_int.py # test int expansion is hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_int_default.test b/mysql-test/suite/tokudb/t/change_column_int_default.test index 7fe235ec578..f02e8fe6871 100644 --- a/mysql-test/suite/tokudb/t/change_column_int_default.test +++ b/mysql-test/suite/tokudb/t/change_column_int_default.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that int expansion + default change works --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_int_descriptor.test b/mysql-test/suite/tokudb/t/change_column_int_descriptor.test index add14fbcff8..1fdf6a08ebd 100644 --- a/mysql-test/suite/tokudb/t/change_column_int_descriptor.test +++ b/mysql-test/suite/tokudb/t/change_column_int_descriptor.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t, ti; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_int_key.test b/mysql-test/suite/tokudb/t/change_column_int_key.test index f3a36e24733..0dd2fe07e74 100644 --- a/mysql-test/suite/tokudb/t/change_column_int_key.test +++ b/mysql-test/suite/tokudb/t/change_column_int_key.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_int_key.py # ensure that changing an int column that is part of a key is not hot --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_int_not_supported.test b/mysql-test/suite/tokudb/t/change_column_int_not_supported.test index 7d595b6b3c6..2b6a8d76eac 100644 --- a/mysql-test/suite/tokudb/t/change_column_int_not_supported.test +++ b/mysql-test/suite/tokudb/t/change_column_int_not_supported.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_int_not_supported.py # ensure that int types are only expanded and are not cnverted to some other type --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_int_rename.test b/mysql-test/suite/tokudb/t/change_column_int_rename.test index 5b37af13496..ce17dd1a21f 100644 --- a/mysql-test/suite/tokudb/t/change_column_int_rename.test +++ b/mysql-test/suite/tokudb/t/change_column_int_rename.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_int_rename.py --disable_warnings DROP TABLE IF EXISTS t, ti; diff --git a/mysql-test/suite/tokudb/t/change_column_multiple_columns.test b/mysql-test/suite/tokudb/t/change_column_multiple_columns.test index c2f1210192b..1b729bea92f 100644 --- a/mysql-test/suite/tokudb/t/change_column_multiple_columns.test +++ b/mysql-test/suite/tokudb/t/change_column_multiple_columns.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test generated by change_multiple_columns.py # this test generated multiple column changes which should all fail since we support only one at a time --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_text.test b/mysql-test/suite/tokudb/t/change_column_text.test index b46ef8e355f..cec49e2ba20 100644 --- a/mysql-test/suite/tokudb/t/change_column_text.test +++ b/mysql-test/suite/tokudb/t/change_column_text.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # this test is generated by change_text.py # generate hot text expansion test cases --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin.test b/mysql-test/suite/tokudb/t/change_column_varbin.test index 111e04cbc35..88fc0ce1837 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbinary expansion is done inplace while varbinary shrinkage is not --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_cross256.test b/mysql-test/suite/tokudb/t/change_column_varbin_cross256.test index f7e08e474a6..e1600a22e25 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_cross256.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_cross256.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_default.test b/mysql-test/suite/tokudb/t/change_column_varbin_default.test index 16b3c7fe31b..d8c88ba8afc 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_default.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_default.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbinary expansion + default change works --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_descriptor.test b/mysql-test/suite/tokudb/t/change_column_varbin_descriptor.test index 8b51124ed03..7c247e8afe7 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_descriptor.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_descriptor.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t, ti; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_key.test b/mysql-test/suite/tokudb/t/change_column_varbin_key.test index 0d932136ad3..d96104750f7 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_key.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_key.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbinary expansion of a field in a key is not supported --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_multiple.test b/mysql-test/suite/tokudb/t/change_column_varbin_multiple.test index 34f5fc78c90..84eea5ea561 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_multiple.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_multiple.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbinary expansion changes the length sum works --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_null.test b/mysql-test/suite/tokudb/t/change_column_varbin_null.test index d0aebe57b43..2f95f2446c4 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_null.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_null.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbinary(X) to varbinary(X) not null is not supported (different type) --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_rename.test b/mysql-test/suite/tokudb/t/change_column_varbin_rename.test index 31372ad5e5d..1f424128bab 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_rename.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_rename.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbinary changed with column rename work --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varbin_varchar.test b/mysql-test/suite/tokudb/t/change_column_varbin_varchar.test index 4fb805a111f..c226d2ac619 100644 --- a/mysql-test/suite/tokudb/t/change_column_varbin_varchar.test +++ b/mysql-test/suite/tokudb/t/change_column_varbin_varchar.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varbin to varchar change is not inplace --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar.test b/mysql-test/suite/tokudb/t/change_column_varchar.test index d8c865b317a..f2b4e3cbf78 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar expansion is done inplace while varchar shrinkage is not --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_charset.test b/mysql-test/suite/tokudb/t/change_column_varchar_charset.test index b47083b5059..a84edf3dea1 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_charset.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_charset.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar change with different charset is not supported inplace --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_cross256.test b/mysql-test/suite/tokudb/t/change_column_varchar_cross256.test index aefe7046149..896160b26c5 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_cross256.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_cross256.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_default.test b/mysql-test/suite/tokudb/t/change_column_varchar_default.test index 2dba1e9efaa..f8240e97c5d 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_default.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_default.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar expansion + default change works --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_descriptor.test b/mysql-test/suite/tokudb/t/change_column_varchar_descriptor.test index 549d8a35c62..12840d29ef9 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_descriptor.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_descriptor.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t, ti; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_key.test b/mysql-test/suite/tokudb/t/change_column_varchar_key.test index d815581190b..2cd69548132 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_key.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_key.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar expansion of a field in a key is not supported --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_null.test b/mysql-test/suite/tokudb/t/change_column_varchar_null.test index bdc25a0d57e..3f194d6c381 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_null.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_null.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar(X) to varchar(X) not null is not supported (different type) --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_a.test b/mysql-test/suite/tokudb/t/change_column_varchar_prefix_a.test index 7dee1966464..202c3a47fc7 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_a.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_prefix_a.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_b.test b/mysql-test/suite/tokudb/t/change_column_varchar_prefix_b.test index 598efb71f8d..e8cd05418d9 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_prefix_b.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_prefix_b.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_rename.test b/mysql-test/suite/tokudb/t/change_column_varchar_rename.test index 82ae926a6fe..1692c4839b9 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_rename.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_rename.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar changed with column rename work --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_sum_cross256.test b/mysql-test/suite/tokudb/t/change_column_varchar_sum_cross256.test index 5365610f8d4..02cf485bb0e 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_sum_cross256.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_sum_cross256.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar expansion changes the length sum works --disable_warnings diff --git a/mysql-test/suite/tokudb/t/change_column_varchar_varbin.test b/mysql-test/suite/tokudb/t/change_column_varchar_varbin.test index ae505270adb..c1d30b4028c 100644 --- a/mysql-test/suite/tokudb/t/change_column_varchar_varbin.test +++ b/mysql-test/suite/tokudb/t/change_column_varchar_varbin.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that varchar to varbin change is not supported inplace --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_1829.test b/mysql-test/suite/tokudb/t/cluster_1829.test index cd978be271a..52762abb6a0 100644 --- a/mysql-test/suite/tokudb/t/cluster_1829.test +++ b/mysql-test/suite/tokudb/t/cluster_1829.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/cluster_2968-0.test b/mysql-test/suite/tokudb/t/cluster_2968-0.test index 40b708d2ff9..a9645878a65 100644 --- a/mysql-test/suite/tokudb/t/cluster_2968-0.test +++ b/mysql-test/suite/tokudb/t/cluster_2968-0.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that the query planner picks clustering keys for joins # create table s diff --git a/mysql-test/suite/tokudb/t/cluster_2968-1.test b/mysql-test/suite/tokudb/t/cluster_2968-1.test index 4a15ca7541b..152cfa92604 100644 --- a/mysql-test/suite/tokudb/t/cluster_2968-1.test +++ b/mysql-test/suite/tokudb/t/cluster_2968-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that the query planner picks clustering keys for joins # create table s diff --git a/mysql-test/suite/tokudb/t/cluster_2968-2.test b/mysql-test/suite/tokudb/t/cluster_2968-2.test index d3c098c058c..3189942fba9 100644 --- a/mysql-test/suite/tokudb/t/cluster_2968-2.test +++ b/mysql-test/suite/tokudb/t/cluster_2968-2.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that the query planner picks clustering keys for joins # create table s diff --git a/mysql-test/suite/tokudb/t/cluster_2968-3.test b/mysql-test/suite/tokudb/t/cluster_2968-3.test index 15f02aea8ac..d0a89c25340 100644 --- a/mysql-test/suite/tokudb/t/cluster_2968-3.test +++ b/mysql-test/suite/tokudb/t/cluster_2968-3.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that the query planner picks clustering keys for 3 table joins # create table s diff --git a/mysql-test/suite/tokudb/t/cluster_create_table.test b/mysql-test/suite/tokudb/t/cluster_create_table.test index 20752aa90de..1ad0a56a9a0 100644 --- a/mysql-test/suite/tokudb/t/cluster_create_table.test +++ b/mysql-test/suite/tokudb/t/cluster_create_table.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_delete.test b/mysql-test/suite/tokudb/t/cluster_delete.test index 83783a9ebc0..935924702e6 100644 --- a/mysql-test/suite/tokudb/t/cluster_delete.test +++ b/mysql-test/suite/tokudb/t/cluster_delete.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_delete2.test b/mysql-test/suite/tokudb/t/cluster_delete2.test index 7a8e3dd798d..5d7d41931ce 100755 --- a/mysql-test/suite/tokudb/t/cluster_delete2.test +++ b/mysql-test/suite/tokudb/t/cluster_delete2.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_filter.test b/mysql-test/suite/tokudb/t/cluster_filter.test index fa239ea1509..ac6fe336407 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter.test +++ b/mysql-test/suite/tokudb/t/cluster_filter.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_filter_hidden.test b/mysql-test/suite/tokudb/t/cluster_filter_hidden.test index d68dcadeb5e..30c13054eb4 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter_hidden.test +++ b/mysql-test/suite/tokudb/t/cluster_filter_hidden.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_filter_key.test b/mysql-test/suite/tokudb/t/cluster_filter_key.test index dfe1756ada7..192e56f10a1 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter_key.test +++ b/mysql-test/suite/tokudb/t/cluster_filter_key.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar.test b/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar.test index 1b44ee90015..1af02e4888c 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar.test +++ b/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test b/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test index c02a8600b47..35d83aff736 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test +++ b/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_hidden.test b/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_hidden.test index 9fe663d8d23..cb95a052d36 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_hidden.test +++ b/mysql-test/suite/tokudb/t/cluster_filter_unpack_varchar_hidden.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_filter_varchar_prefix.test b/mysql-test/suite/tokudb/t/cluster_filter_varchar_prefix.test index 9f9fa1c5877..27e73ee383f 100755 --- a/mysql-test/suite/tokudb/t/cluster_filter_varchar_prefix.test +++ b/mysql-test/suite/tokudb/t/cluster_filter_varchar_prefix.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --echo *** Bug #22169 *** diff --git a/mysql-test/suite/tokudb/t/cluster_key.test b/mysql-test/suite/tokudb/t/cluster_key.test index c8f06ba7f88..55420c85285 100644 --- a/mysql-test/suite/tokudb/t/cluster_key.test +++ b/mysql-test/suite/tokudb/t/cluster_key.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_query_plan.test b/mysql-test/suite/tokudb/t/cluster_query_plan.test index 6317583bb8c..989d93728c1 100644 --- a/mysql-test/suite/tokudb/t/cluster_query_plan.test +++ b/mysql-test/suite/tokudb/t/cluster_query_plan.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993.test b/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993.test index e15c2fb9a5a..b0d704e9af2 100644 --- a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993.test +++ b/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993_2.test b/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993_2.test index a31f9cadfa8..7a8e2ba6eac 100644 --- a/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993_2.test +++ b/mysql-test/suite/tokudb/t/cluster_tokudb_bug_993_2.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/cluster_update.test b/mysql-test/suite/tokudb/t/cluster_update.test index 2d5e203df9d..194fd641fc0 100644 --- a/mysql-test/suite/tokudb/t/cluster_update.test +++ b/mysql-test/suite/tokudb/t/cluster_update.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/cluster_update2.test b/mysql-test/suite/tokudb/t/cluster_update2.test index 366a58aaa6b..aaa7a9e026e 100755 --- a/mysql-test/suite/tokudb/t/cluster_update2.test +++ b/mysql-test/suite/tokudb/t/cluster_update2.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/ctype_ascii.test b/mysql-test/suite/tokudb/t/ctype_ascii.test index 14505ce0f45..26c89044d32 100644 --- a/mysql-test/suite/tokudb/t/ctype_ascii.test +++ b/mysql-test/suite/tokudb/t/ctype_ascii.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #27562: ascii.xml invalid? diff --git a/mysql-test/suite/tokudb/t/ctype_collate.test b/mysql-test/suite/tokudb/t/ctype_collate.test index c9e560b888b..76a6221da4e 100644 --- a/mysql-test/suite/tokudb/t/ctype_collate.test +++ b/mysql-test/suite/tokudb/t/ctype_collate.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; SET DEFAULT_STORAGE_ENGINE='tokudb'; --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test b/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test index 62f77500cb7..42aede8fa5e 100644 --- a/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test +++ b/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; SET DEFAULT_STORAGE_ENGINE='tokudb'; -- source include/have_cp1250_ch.inc --disable_warnings diff --git a/mysql-test/suite/tokudb/t/ctype_cp1251.test b/mysql-test/suite/tokudb/t/ctype_cp1251.test index 0ff9e83e6a3..3b0f56893df 100644 --- a/mysql-test/suite/tokudb/t/ctype_cp1251.test +++ b/mysql-test/suite/tokudb/t/ctype_cp1251.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Test of charset cp1251 SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-del-0.test b/mysql-test/suite/tokudb/t/hotindex-del-0.test index 1af79715daa..4ebb8476538 100644 --- a/mysql-test/suite/tokudb/t/hotindex-del-0.test +++ b/mysql-test/suite/tokudb/t/hotindex-del-0.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-del-1.test b/mysql-test/suite/tokudb/t/hotindex-del-1.test index aa4866bb612..b46aee575ed 100644 --- a/mysql-test/suite/tokudb/t/hotindex-del-1.test +++ b/mysql-test/suite/tokudb/t/hotindex-del-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-del-fast.test b/mysql-test/suite/tokudb/t/hotindex-del-fast.test index 50256802328..63c3cafda43 100644 --- a/mysql-test/suite/tokudb/t/hotindex-del-fast.test +++ b/mysql-test/suite/tokudb/t/hotindex-del-fast.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-del-slow.test b/mysql-test/suite/tokudb/t/hotindex-del-slow.test index 2b267932907..445b18b5d24 100644 --- a/mysql-test/suite/tokudb/t/hotindex-del-slow.test +++ b/mysql-test/suite/tokudb/t/hotindex-del-slow.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-0.test b/mysql-test/suite/tokudb/t/hotindex-insert-0.test index 30eeedcff9c..c54c2d6e471 100644 --- a/mysql-test/suite/tokudb/t/hotindex-insert-0.test +++ b/mysql-test/suite/tokudb/t/hotindex-insert-0.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-1.test b/mysql-test/suite/tokudb/t/hotindex-insert-1.test index 83adb3eddc6..f90b4d04ad8 100644 --- a/mysql-test/suite/tokudb/t/hotindex-insert-1.test +++ b/mysql-test/suite/tokudb/t/hotindex-insert-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-2.test b/mysql-test/suite/tokudb/t/hotindex-insert-2.test index 0c05c685660..2496b72ee48 100644 --- a/mysql-test/suite/tokudb/t/hotindex-insert-2.test +++ b/mysql-test/suite/tokudb/t/hotindex-insert-2.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on with replace into optimization # test is checking #3406 diff --git a/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test b/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test index 362e1437100..1f2619b476e 100644 --- a/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test +++ b/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-update-0.test b/mysql-test/suite/tokudb/t/hotindex-update-0.test index b32a6f9ffd2..92f0ea3c459 100644 --- a/mysql-test/suite/tokudb/t/hotindex-update-0.test +++ b/mysql-test/suite/tokudb/t/hotindex-update-0.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/hotindex-update-1.test b/mysql-test/suite/tokudb/t/hotindex-update-1.test index e61ee5855d3..c8ecbaf4bf0 100644 --- a/mysql-test/suite/tokudb/t/hotindex-update-1.test +++ b/mysql-test/suite/tokudb/t/hotindex-update-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that deletes work when hot indexing is on SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/information-schema-global-status.test b/mysql-test/suite/tokudb/t/information-schema-global-status.test index 40ccbb5a1f9..d984862b00a 100644 --- a/mysql-test/suite/tokudb/t/information-schema-global-status.test +++ b/mysql-test/suite/tokudb/t/information-schema-global-status.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # check that we have the appropriate engine-specific values in information_schema.global_status select variable_name from information_schema.global_status where variable_name like 'tokudb%' order by variable_name asc;
\ No newline at end of file diff --git a/mysql-test/suite/tokudb/t/lockretry-insert.writelocktable.test b/mysql-test/suite/tokudb/t/lockretry-insert.writelocktable.test index 62835d27117..b25449cc3c4 100644 --- a/mysql-test/suite/tokudb/t/lockretry-insert.writelocktable.test +++ b/mysql-test/suite/tokudb/t/lockretry-insert.writelocktable.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert.test b/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert.test index fbabb6ceaa3..6f3a7b73b5c 100644 --- a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert.test +++ b/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert2.test b/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert2.test index 6eec3efc8e8..4f80484b907 100644 --- a/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert2.test +++ b/mysql-test/suite/tokudb/t/lockretry-writelocktable.insert2.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings diff --git a/mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test b/mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test index 3392e7c989a..a2fb427fac2 100644 --- a/mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test +++ b/mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # 9/22/2011 # Test that getting and setting the value for # blocking row lock timeout works correctly. diff --git a/mysql-test/suite/tokudb/t/locks-blocking-row-locks.test b/mysql-test/suite/tokudb/t/locks-blocking-row-locks.test index ef953b15a5d..008770c6083 100644 --- a/mysql-test/suite/tokudb/t/locks-blocking-row-locks.test +++ b/mysql-test/suite/tokudb/t/locks-blocking-row-locks.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Tokutek # Blocking row lock tests; # Generated by locks-blocking-row-locks-testgen.py on 2013-10-14; diff --git a/mysql-test/suite/tokudb/t/locks-delete-deadlock-1.test b/mysql-test/suite/tokudb/t/locks-delete-deadlock-1.test index 67c1a1fb44c..7a39c04f8ca 100644 --- a/mysql-test/suite/tokudb/t/locks-delete-deadlock-1.test +++ b/mysql-test/suite/tokudb/t/locks-delete-deadlock-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that delete only takes write locks when tokudb_use_write_locks is asserted # t1 scans all of the rows in a table and deletes 1 of them # t1 grabs a write range lock on -infinity +infinity diff --git a/mysql-test/suite/tokudb/t/locks-no-read-lock-serializable-autocommit.test b/mysql-test/suite/tokudb/t/locks-no-read-lock-serializable-autocommit.test index d1d00a5bf06..0db1424f754 100644 --- a/mysql-test/suite/tokudb/t/locks-no-read-lock-serializable-autocommit.test +++ b/mysql-test/suite/tokudb/t/locks-no-read-lock-serializable-autocommit.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Tokutek # test that read locks are not taken with serializable isolation and # autocommit on, refs 3532 diff --git a/mysql-test/suite/tokudb/t/locks-select-update-1.test b/mysql-test/suite/tokudb/t/locks-select-update-1.test index 90d8e0b0db6..1f8fb039092 100644 --- a/mysql-test/suite/tokudb/t/locks-select-update-1.test +++ b/mysql-test/suite/tokudb/t/locks-select-update-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that select for update is executed with serializable isolation SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/locks-select-update-2.test b/mysql-test/suite/tokudb/t/locks-select-update-2.test index ae7f79aca74..0945fc39e58 100644 --- a/mysql-test/suite/tokudb/t/locks-select-update-2.test +++ b/mysql-test/suite/tokudb/t/locks-select-update-2.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that select for update is executed with serializable isolation SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/locks-select-update-3.test b/mysql-test/suite/tokudb/t/locks-select-update-3.test index 64077ba24fd..a563f061add 100644 --- a/mysql-test/suite/tokudb/t/locks-select-update-3.test +++ b/mysql-test/suite/tokudb/t/locks-select-update-3.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that select for update is executed with serializable isolation SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/locks-update-deadlock-1.test b/mysql-test/suite/tokudb/t/locks-update-deadlock-1.test index 53abf49820b..a9c90862b71 100644 --- a/mysql-test/suite/tokudb/t/locks-update-deadlock-1.test +++ b/mysql-test/suite/tokudb/t/locks-update-deadlock-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test that update only take write locks # t1 scans all of the rows in a table and updates 1 of them # t1 grabs a write range lock on -infinity +infinity diff --git a/mysql-test/suite/tokudb/t/mvcc-1.test b/mysql-test/suite/tokudb/t/mvcc-1.test index 889e69f161a..dd9bb3f66f8 100755 --- a/mysql-test/suite/tokudb/t/mvcc-1.test +++ b/mysql-test/suite/tokudb/t/mvcc-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # ticket 895 is a query optimization problem with the primary key SET DEFAULT_STORAGE_ENGINE = 'tokudb'; diff --git a/mysql-test/suite/tokudb/t/mvcc-10.test b/mysql-test/suite/tokudb/t/mvcc-10.test index e5a543d514c..6aff3976dfc 100755 --- a/mysql-test/suite/tokudb/t/mvcc-10.test +++ b/mysql-test/suite/tokudb/t/mvcc-10.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-11.test b/mysql-test/suite/tokudb/t/mvcc-11.test index 1ed3f005c8a..9daafe94207 100755 --- a/mysql-test/suite/tokudb/t/mvcc-11.test +++ b/mysql-test/suite/tokudb/t/mvcc-11.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-12.test b/mysql-test/suite/tokudb/t/mvcc-12.test index 89c56979f0e..8fd445677b4 100755 --- a/mysql-test/suite/tokudb/t/mvcc-12.test +++ b/mysql-test/suite/tokudb/t/mvcc-12.test @@ -1,6 +1,6 @@ # simple serializable test -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-13.test b/mysql-test/suite/tokudb/t/mvcc-13.test index 6c2b16d709e..bbaa0769b0d 100755 --- a/mysql-test/suite/tokudb/t/mvcc-13.test +++ b/mysql-test/suite/tokudb/t/mvcc-13.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-14.test b/mysql-test/suite/tokudb/t/mvcc-14.test index 10e735d0651..d01d033102e 100755 --- a/mysql-test/suite/tokudb/t/mvcc-14.test +++ b/mysql-test/suite/tokudb/t/mvcc-14.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-15.test b/mysql-test/suite/tokudb/t/mvcc-15.test index 12d04632f81..292c87aebce 100755 --- a/mysql-test/suite/tokudb/t/mvcc-15.test +++ b/mysql-test/suite/tokudb/t/mvcc-15.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-16.test b/mysql-test/suite/tokudb/t/mvcc-16.test index c5cc4025b5a..1ea295998fe 100755 --- a/mysql-test/suite/tokudb/t/mvcc-16.test +++ b/mysql-test/suite/tokudb/t/mvcc-16.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-17.test b/mysql-test/suite/tokudb/t/mvcc-17.test index f9fcc757995..3e2a84f84a6 100755 --- a/mysql-test/suite/tokudb/t/mvcc-17.test +++ b/mysql-test/suite/tokudb/t/mvcc-17.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-18.test b/mysql-test/suite/tokudb/t/mvcc-18.test index a936efa3955..734a8502f66 100755 --- a/mysql-test/suite/tokudb/t/mvcc-18.test +++ b/mysql-test/suite/tokudb/t/mvcc-18.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-19.test b/mysql-test/suite/tokudb/t/mvcc-19.test index 8aba42c51ab..ac8087c4c1f 100755 --- a/mysql-test/suite/tokudb/t/mvcc-19.test +++ b/mysql-test/suite/tokudb/t/mvcc-19.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/t/mvcc-2.test b/mysql-test/suite/tokudb/t/mvcc-2.test index c3f3db15f19..e9bc2d782ce 100755 --- a/mysql-test/suite/tokudb/t/mvcc-2.test +++ b/mysql-test/suite/tokudb/t/mvcc-2.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/t/mvcc-20.test b/mysql-test/suite/tokudb/t/mvcc-20.test index 403e7b004e7..03bd7abd031 100755 --- a/mysql-test/suite/tokudb/t/mvcc-20.test +++ b/mysql-test/suite/tokudb/t/mvcc-20.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/t/mvcc-21.test b/mysql-test/suite/tokudb/t/mvcc-21.test index 9dbef11db18..502383d2bb8 100755 --- a/mysql-test/suite/tokudb/t/mvcc-21.test +++ b/mysql-test/suite/tokudb/t/mvcc-21.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-22.test b/mysql-test/suite/tokudb/t/mvcc-22.test index c736e5f2786..b9c4d94e341 100755 --- a/mysql-test/suite/tokudb/t/mvcc-22.test +++ b/mysql-test/suite/tokudb/t/mvcc-22.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-23.test b/mysql-test/suite/tokudb/t/mvcc-23.test index afc3e791bf5..7ab1778599b 100755 --- a/mysql-test/suite/tokudb/t/mvcc-23.test +++ b/mysql-test/suite/tokudb/t/mvcc-23.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-24.test b/mysql-test/suite/tokudb/t/mvcc-24.test index 4a2eaaab74f..ff13500e663 100755 --- a/mysql-test/suite/tokudb/t/mvcc-24.test +++ b/mysql-test/suite/tokudb/t/mvcc-24.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-25.test b/mysql-test/suite/tokudb/t/mvcc-25.test index 5c315578c4b..fc0198d7a35 100755 --- a/mysql-test/suite/tokudb/t/mvcc-25.test +++ b/mysql-test/suite/tokudb/t/mvcc-25.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-26.test b/mysql-test/suite/tokudb/t/mvcc-26.test index ace99513401..7711b3105ce 100755 --- a/mysql-test/suite/tokudb/t/mvcc-26.test +++ b/mysql-test/suite/tokudb/t/mvcc-26.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # ticket 895 is a query optimization problem with the primary key SET DEFAULT_STORAGE_ENGINE = 'tokudb'; diff --git a/mysql-test/suite/tokudb/t/mvcc-27.test b/mysql-test/suite/tokudb/t/mvcc-27.test index 564593677b4..b6a146582a7 100755 --- a/mysql-test/suite/tokudb/t/mvcc-27.test +++ b/mysql-test/suite/tokudb/t/mvcc-27.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/t/mvcc-28.test b/mysql-test/suite/tokudb/t/mvcc-28.test index d5b47c4e459..b668ed77716 100755 --- a/mysql-test/suite/tokudb/t/mvcc-28.test +++ b/mysql-test/suite/tokudb/t/mvcc-28.test @@ -1,6 +1,6 @@ # verify that serializable properly reads provisional delete and actual value -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-2808-read-committed.test b/mysql-test/suite/tokudb/t/mvcc-2808-read-committed.test index d51fed16b1b..11c879ba6d8 100755 --- a/mysql-test/suite/tokudb/t/mvcc-2808-read-committed.test +++ b/mysql-test/suite/tokudb/t/mvcc-2808-read-committed.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/t/mvcc-2808-read-uncommitted.test b/mysql-test/suite/tokudb/t/mvcc-2808-read-uncommitted.test index be82c9c8a10..d4bf6beb7d2 100755 --- a/mysql-test/suite/tokudb/t/mvcc-2808-read-uncommitted.test +++ b/mysql-test/suite/tokudb/t/mvcc-2808-read-uncommitted.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/t/mvcc-29.test b/mysql-test/suite/tokudb/t/mvcc-29.test index 764e15230cf..115063ec3fe 100755 --- a/mysql-test/suite/tokudb/t/mvcc-29.test +++ b/mysql-test/suite/tokudb/t/mvcc-29.test @@ -1,6 +1,6 @@ # simple keyrange64 test, ensure that it reads number of leafentries in the system -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-3.test b/mysql-test/suite/tokudb/t/mvcc-3.test index 83e90dd8cc9..7187ed75842 100755 --- a/mysql-test/suite/tokudb/t/mvcc-3.test +++ b/mysql-test/suite/tokudb/t/mvcc-3.test @@ -1,7 +1,7 @@ # test simple mvcc, that a transaction does not read a transaction's element that was live when it began set session transaction isolation level repeatable read; -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-30.test b/mysql-test/suite/tokudb/t/mvcc-30.test index ea1ce63a862..6455d75a2eb 100755 --- a/mysql-test/suite/tokudb/t/mvcc-30.test +++ b/mysql-test/suite/tokudb/t/mvcc-30.test @@ -1,6 +1,6 @@ # simple keyrange64 test, ensure that it reads number of leafentries in the system -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-31.test b/mysql-test/suite/tokudb/t/mvcc-31.test index ce638795095..2fe15a9ef6e 100755 --- a/mysql-test/suite/tokudb/t/mvcc-31.test +++ b/mysql-test/suite/tokudb/t/mvcc-31.test @@ -1,6 +1,6 @@ # simple keyrange64 test, ensure that it reads number of leafentries in the system -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-33.test b/mysql-test/suite/tokudb/t/mvcc-33.test index 50e91f8cada..13be98199b6 100755 --- a/mysql-test/suite/tokudb/t/mvcc-33.test +++ b/mysql-test/suite/tokudb/t/mvcc-33.test @@ -1,6 +1,6 @@ # verify a db_get sees data that transaction inserted, and that it does not read data that is too new -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-34.test b/mysql-test/suite/tokudb/t/mvcc-34.test index 6870933b82c..308701d5ed7 100755 --- a/mysql-test/suite/tokudb/t/mvcc-34.test +++ b/mysql-test/suite/tokudb/t/mvcc-34.test @@ -1,6 +1,6 @@ # verify a db_get does not read a transaction's data because it is in live list -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-35.test b/mysql-test/suite/tokudb/t/mvcc-35.test index 921cbf9e575..541634179ca 100755 --- a/mysql-test/suite/tokudb/t/mvcc-35.test +++ b/mysql-test/suite/tokudb/t/mvcc-35.test @@ -1,6 +1,6 @@ # verify a db_get does not read a read committed transaction's data because it is in live list -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-36.test b/mysql-test/suite/tokudb/t/mvcc-36.test index b976fbe89ca..fe289a408b9 100755 --- a/mysql-test/suite/tokudb/t/mvcc-36.test +++ b/mysql-test/suite/tokudb/t/mvcc-36.test @@ -1,6 +1,6 @@ # verify a db_get does not read a read committed transaction's data because it is in live list -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-37.test b/mysql-test/suite/tokudb/t/mvcc-37.test index 1e303e4fc69..9965037b76d 100755 --- a/mysql-test/suite/tokudb/t/mvcc-37.test +++ b/mysql-test/suite/tokudb/t/mvcc-37.test @@ -1,6 +1,6 @@ # verify a db_get does not read a read committed transaction's data because it is in live list -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-38.test b/mysql-test/suite/tokudb/t/mvcc-38.test index 2e6fea8f629..f1788d84466 100755 --- a/mysql-test/suite/tokudb/t/mvcc-38.test +++ b/mysql-test/suite/tokudb/t/mvcc-38.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-39.test b/mysql-test/suite/tokudb/t/mvcc-39.test index 277c3f08db4..b495adaec15 100755 --- a/mysql-test/suite/tokudb/t/mvcc-39.test +++ b/mysql-test/suite/tokudb/t/mvcc-39.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-4.test b/mysql-test/suite/tokudb/t/mvcc-4.test index 611ff60fc5f..525119549c7 100755 --- a/mysql-test/suite/tokudb/t/mvcc-4.test +++ b/mysql-test/suite/tokudb/t/mvcc-4.test @@ -1,6 +1,6 @@ # test that we read data that was committed before we began -#--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/t/mvcc-40.test b/mysql-test/suite/tokudb/t/mvcc-40.test index 82acbe81f36..8f3b40e8430 100755 --- a/mysql-test/suite/tokudb/t/mvcc-40.test +++ b/mysql-test/suite/tokudb/t/mvcc-40.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-5.test b/mysql-test/suite/tokudb/t/mvcc-5.test index 271f890cad0..fda703e3467 100755 --- a/mysql-test/suite/tokudb/t/mvcc-5.test +++ b/mysql-test/suite/tokudb/t/mvcc-5.test @@ -1,6 +1,6 @@ # verify that repeatable read uses one snapshot, whereas read committed keeps taking new ones -#--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/t/mvcc-6.test b/mysql-test/suite/tokudb/t/mvcc-6.test index e5493124027..5222420aeae 100755 --- a/mysql-test/suite/tokudb/t/mvcc-6.test +++ b/mysql-test/suite/tokudb/t/mvcc-6.test @@ -1,6 +1,6 @@ # make sure reads done during writes take read locks -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-7.test b/mysql-test/suite/tokudb/t/mvcc-7.test index a7aa9e7381c..c95e471cd1e 100755 --- a/mysql-test/suite/tokudb/t/mvcc-7.test +++ b/mysql-test/suite/tokudb/t/mvcc-7.test @@ -1,6 +1,6 @@ # make sure reads done during writes take read locks -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-8.test b/mysql-test/suite/tokudb/t/mvcc-8.test index 740838662e4..5560596f9ce 100755 --- a/mysql-test/suite/tokudb/t/mvcc-8.test +++ b/mysql-test/suite/tokudb/t/mvcc-8.test @@ -1,6 +1,6 @@ # verify that serializable get of a repeatable read transaction grabs read lock -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'tokudb'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-9.test b/mysql-test/suite/tokudb/t/mvcc-9.test index bc4bf23d607..2cc78e2894e 100755 --- a/mysql-test/suite/tokudb/t/mvcc-9.test +++ b/mysql-test/suite/tokudb/t/mvcc-9.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/mvcc-checksum-locks.test b/mysql-test/suite/tokudb/t/mvcc-checksum-locks.test index eb9c8cb9e97..91b08d8afec 100755 --- a/mysql-test/suite/tokudb/t/mvcc-checksum-locks.test +++ b/mysql-test/suite/tokudb/t/mvcc-checksum-locks.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'; --echo # Establish connection conn1 (user = root) diff --git a/mysql-test/suite/tokudb/t/nested_txn_autocommit.test b/mysql-test/suite/tokudb/t/nested_txn_autocommit.test index 5963df8e916..4efc3838130 100755 --- a/mysql-test/suite/tokudb/t/nested_txn_autocommit.test +++ b/mysql-test/suite/tokudb/t/nested_txn_autocommit.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='TokuDB'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/nested_txn_begin.test b/mysql-test/suite/tokudb/t/nested_txn_begin.test index df0213177f4..5b902ff6de6 100755 --- a/mysql-test/suite/tokudb/t/nested_txn_begin.test +++ b/mysql-test/suite/tokudb/t/nested_txn_begin.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='TokuDB'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/nested_txn_implicit_commit.test b/mysql-test/suite/tokudb/t/nested_txn_implicit_commit.test index 4f6f27aad4d..3be67aa7de3 100755 --- a/mysql-test/suite/tokudb/t/nested_txn_implicit_commit.test +++ b/mysql-test/suite/tokudb/t/nested_txn_implicit_commit.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='TokuDB'; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/prim_key_1.test b/mysql-test/suite/tokudb/t/prim_key_1.test index 07c8e312552..adb1f944fd9 100644 --- a/mysql-test/suite/tokudb/t/prim_key_1.test +++ b/mysql-test/suite/tokudb/t/prim_key_1.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/prim_key_2.test b/mysql-test/suite/tokudb/t/prim_key_2.test index 7ec2cc8e823..fa05b5d91b5 100644 --- a/mysql-test/suite/tokudb/t/prim_key_2.test +++ b/mysql-test/suite/tokudb/t/prim_key_2.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/prim_key_3.test b/mysql-test/suite/tokudb/t/prim_key_3.test index cd6a690a23a..11851035c27 100644 --- a/mysql-test/suite/tokudb/t/prim_key_3.test +++ b/mysql-test/suite/tokudb/t/prim_key_3.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/prim_key_4.test b/mysql-test/suite/tokudb/t/prim_key_4.test index 497a2ddafb9..b323380a4dd 100644 --- a/mysql-test/suite/tokudb/t/prim_key_4.test +++ b/mysql-test/suite/tokudb/t/prim_key_4.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/prim_key_5.test b/mysql-test/suite/tokudb/t/prim_key_5.test index 5c4b291aa55..c8c152170ee 100644 --- a/mysql-test/suite/tokudb/t/prim_key_5.test +++ b/mysql-test/suite/tokudb/t/prim_key_5.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/prim_key_6.test b/mysql-test/suite/tokudb/t/prim_key_6.test index 573c4e7d649..548e660fe8f 100644 --- a/mysql-test/suite/tokudb/t/prim_key_6.test +++ b/mysql-test/suite/tokudb/t/prim_key_6.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # # Bug #22169: Crash with count(distinct) diff --git a/mysql-test/suite/tokudb/t/replace-ignore.test b/mysql-test/suite/tokudb/t/replace-ignore.test index fed8d5bf368..5b95ac7db63 100644 --- a/mysql-test/suite/tokudb/t/replace-ignore.test +++ b/mysql-test/suite/tokudb/t/replace-ignore.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Tokutek # Test that replace into and insert ignore insertions # work under various index schemas. diff --git a/mysql-test/suite/tokudb/t/rows-32m-0.test b/mysql-test/suite/tokudb/t/rows-32m-0.test index 3935293ca69..58a5ac1b8e3 100644 --- a/mysql-test/suite/tokudb/t/rows-32m-0.test +++ b/mysql-test/suite/tokudb/t/rows-32m-0.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # verify that trickle loads or bulk loads can not insert values > 32MB SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/rows-32m-1.test b/mysql-test/suite/tokudb/t/rows-32m-1.test index ac35afd74a4..39feddf77be 100644 --- a/mysql-test/suite/tokudb/t/rows-32m-1.test +++ b/mysql-test/suite/tokudb/t/rows-32m-1.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # verify that trickle loads or bulk loads can not insert values > 32MB SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/rows-32m-rand-insert.test b/mysql-test/suite/tokudb/t/rows-32m-rand-insert.test index db5c2ce30e6..89a1fd97fec 100644 --- a/mysql-test/suite/tokudb/t/rows-32m-rand-insert.test +++ b/mysql-test/suite/tokudb/t/rows-32m-rand-insert.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # do a lot of longblob insertions up to 32MB-4 in size with a random key SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/rows-32m-seq-insert.test b/mysql-test/suite/tokudb/t/rows-32m-seq-insert.test index 35dee174771..5b1f5440452 100644 --- a/mysql-test/suite/tokudb/t/rows-32m-seq-insert.test +++ b/mysql-test/suite/tokudb/t/rows-32m-seq-insert.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # do a lot of longblob insertions up to 32MB-4 in size with seq primary key SET DEFAULT_STORAGE_ENGINE='tokudb'; diff --git a/mysql-test/suite/tokudb/t/savepoint-3.test b/mysql-test/suite/tokudb/t/savepoint-3.test index bd75a93e7c0..8fff8ab498d 100755 --- a/mysql-test/suite/tokudb/t/savepoint-3.test +++ b/mysql-test/suite/tokudb/t/savepoint-3.test @@ -1,4 +1,4 @@ -#--source include/have_tokudb.inc +--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE = 'TokuDB'; delimiter |; diff --git a/mysql-test/suite/tokudb/t/simple_delete_all.test b/mysql-test/suite/tokudb/t/simple_delete_all.test index 7ebaabd0413..f4a0c782b98 100644 --- a/mysql-test/suite/tokudb/t/simple_delete_all.test +++ b/mysql-test/suite/tokudb/t/simple_delete_all.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # verify that delete from table leaves the table empty --disable_warnings drop table if exists t; diff --git a/mysql-test/suite/tokudb/t/simple_join_tokudb_myisam.test b/mysql-test/suite/tokudb/t/simple_join_tokudb_myisam.test index 68b301cdb8a..77fc4afcb51 100644 --- a/mysql-test/suite/tokudb/t/simple_join_tokudb_myisam.test +++ b/mysql-test/suite/tokudb/t/simple_join_tokudb_myisam.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # simple join tokudb and innodb --disable_warnings diff --git a/mysql-test/suite/tokudb/t/simple_truncate.test b/mysql-test/suite/tokudb/t/simple_truncate.test index 84647e94152..57eace950a4 100644 --- a/mysql-test/suite/tokudb/t/simple_truncate.test +++ b/mysql-test/suite/tokudb/t/simple_truncate.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # verify that truncate table leaves the table empty --disable_warnings drop table if exists t; diff --git a/mysql-test/suite/tokudb/t/sql_mode_default.test b/mysql-test/suite/tokudb/t/sql_mode_default.test index eefc481c0b4..5a1f28cc990 100644 --- a/mysql-test/suite/tokudb/t/sql_mode_default.test +++ b/mysql-test/suite/tokudb/t/sql_mode_default.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # Tokutek # Test that the default sql_mode is NO_ENGINE_SUBSTITUTION diff --git a/mysql-test/suite/tokudb/t/truncate_row_count.test b/mysql-test/suite/tokudb/t/truncate_row_count.test index 4b3848fc0da..fea4d67eba4 100644 --- a/mysql-test/suite/tokudb/t/truncate_row_count.test +++ b/mysql-test/suite/tokudb/t/truncate_row_count.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # verify that truncate table leaves the table empty and sets the row count # to zero. --disable_warnings diff --git a/mysql-test/suite/tokudb/t/truncate_txn_commit.test b/mysql-test/suite/tokudb/t/truncate_txn_commit.test index dcafc5844ae..2a8cc3ab16b 100644 --- a/mysql-test/suite/tokudb/t/truncate_txn_commit.test +++ b/mysql-test/suite/tokudb/t/truncate_txn_commit.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test truncate commit set autocommit=off; --disable_warnings diff --git a/mysql-test/suite/tokudb/t/truncate_txn_rollback.test b/mysql-test/suite/tokudb/t/truncate_txn_rollback.test index 744713b450a..98d4b9c80e5 100644 --- a/mysql-test/suite/tokudb/t/truncate_txn_rollback.test +++ b/mysql-test/suite/tokudb/t/truncate_txn_rollback.test @@ -1,3 +1,4 @@ +source include/have_tokudb.inc; # test truncate commit set autocommit=off; --disable_warnings |