From b585b4f71b29bf2f4e5e83f08a33603f05887f1a Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Wed, 27 Aug 2014 18:00:57 -0400 Subject: [PATCH] DB-713 separate some long running tokudb tests so that valgrind runs without --big-test can exclude them --- mysql-test/suite/tokudb.bugs/t/part_index_scan.test | 2 ++ mysql-test/suite/tokudb/t/bf_create_select_hash_part.test | 2 ++ mysql-test/suite/tokudb/t/bf_create_select_nonpart.test | 2 ++ mysql-test/suite/tokudb/t/bf_create_select_range_part.test | 2 ++ mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test | 2 ++ mysql-test/suite/tokudb/t/bf_delete_nonpart.test | 1 + mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test | 2 ++ mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test | 2 ++ mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test | 2 ++ mysql-test/suite/tokudb/t/bf_select_part.test | 2 ++ 10 files changed, 19 insertions(+) diff --git a/mysql-test/suite/tokudb.bugs/t/part_index_scan.test b/mysql-test/suite/tokudb.bugs/t/part_index_scan.test index 69c4380bf50c1..b38a979752b91 100644 --- a/mysql-test/suite/tokudb.bugs/t/part_index_scan.test +++ b/mysql-test/suite/tokudb.bugs/t/part_index_scan.test @@ -1,7 +1,9 @@ # verify that index scans on parititions are not slow # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; source include/have_partition.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2,t3; diff --git a/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test b/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test index 1b7f07f2527b9..b9ec8c52aa883 100644 --- a/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test +++ b/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test @@ -1,8 +1,10 @@ # Verify that index and range scans are not slow # on tables during create select statements # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; source include/have_partition.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2,t3; diff --git a/mysql-test/suite/tokudb/t/bf_create_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_create_select_nonpart.test index 7e70eb2da6b32..a8b7f9c9f6a55 100644 --- a/mysql-test/suite/tokudb/t/bf_create_select_nonpart.test +++ b/mysql-test/suite/tokudb/t/bf_create_select_nonpart.test @@ -1,7 +1,9 @@ # Verify that index and range scans are not slow # on tables during create select statements # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2; diff --git a/mysql-test/suite/tokudb/t/bf_create_select_range_part.test b/mysql-test/suite/tokudb/t/bf_create_select_range_part.test index 5b94f5e97bffb..a48f272b84fa8 100644 --- a/mysql-test/suite/tokudb/t/bf_create_select_range_part.test +++ b/mysql-test/suite/tokudb/t/bf_create_select_range_part.test @@ -1,8 +1,10 @@ # Verify that index and range scans are not slow # on tables during create select statements # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; source include/have_partition.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2; diff --git a/mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test index 56e3c91dbdf1e..fdd665076c9e4 100644 --- a/mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test +++ b/mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test @@ -1,7 +1,9 @@ # Verify that index and range scans are not slow # on temporary tables during create select statements # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2; diff --git a/mysql-test/suite/tokudb/t/bf_delete_nonpart.test b/mysql-test/suite/tokudb/t/bf_delete_nonpart.test index b80b3e6c3c969..65b26df230e51 100644 --- a/mysql-test/suite/tokudb/t/bf_delete_nonpart.test +++ b/mysql-test/suite/tokudb/t/bf_delete_nonpart.test @@ -2,6 +2,7 @@ # at least twice as fast source include/have_tokudb.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t; diff --git a/mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test b/mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test index 5774a3c17d7fe..3200beeaba98a 100644 --- a/mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test +++ b/mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test @@ -3,7 +3,9 @@ # due to tokudb bulk fetch not being used. # In this test case, the on duplicate key condition does not need to fire # since the performance of the embedded select statement is all we are measuring. + source include/have_tokudb.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2; diff --git a/mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test index 31399dedae785..11f14013a3017 100644 --- a/mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test +++ b/mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test @@ -1,7 +1,9 @@ # Verify that index and range scans are not slow # on tables during insert select statements # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2; diff --git a/mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test index 6e900bcd9d33b..380eb5adda8b8 100644 --- a/mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test +++ b/mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test @@ -1,7 +1,9 @@ # Verify that index and range scans are not slow # on tables during replace select and insert ignore statements # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2; diff --git a/mysql-test/suite/tokudb/t/bf_select_part.test b/mysql-test/suite/tokudb/t/bf_select_part.test index 2e7bfd9a0d292..d9faa4b0bb23c 100644 --- a/mysql-test/suite/tokudb/t/bf_select_part.test +++ b/mysql-test/suite/tokudb/t/bf_select_part.test @@ -2,8 +2,10 @@ # on tables during create select statements # against hash and range partitioned tables # due to tokudb bulk fetch not being used + source include/have_tokudb.inc; source include/have_partition.inc; +source include/big_test.inc; set default_storage_engine='tokudb'; disable_warnings; drop table if exists t,t1,t2,t3;