diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-07 16:22:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-07 16:22:36 +0100 |
| commit | 2682a280c8095a367fc8cbe2c1323ba4340f75e8 (patch) | |
| tree | 4c6aeb798dcb963b0df31cf3da1e823a70d67608 /mysql-test/suite | |
| parent | e83dd9b517239dedb727263c7eeda89ada6d4c57 (diff) | |
| download | mariadb-git-2682a280c8095a367fc8cbe2c1323ba4340f75e8.tar.gz | |
allow suite.pm to skip combinations that originate from test/include files.
storage/innobase/handler/handler0alter.cc:
for NEWDATE key_type says unsigned, thus col->prtype says unsigned,
but field->flags says signed. Use the same flag for value retrieval
that was used for value storage.
Diffstat (limited to 'mysql-test/suite')
99 files changed, 115 insertions, 45 deletions
diff --git a/mysql-test/suite/federated/suite.pm b/mysql-test/suite/federated/suite.pm index 06458b97adc..6b97fd6528e 100644 --- a/mysql-test/suite/federated/suite.pm +++ b/mysql-test/suite/federated/suite.pm @@ -2,18 +2,17 @@ package My::Suite::Federated; @ISA = qw(My::Suite); -############# initialization ###################### -my @combinations; +sub skip_combinations { + my @combinations; -push @combinations, 'old' - if $ENV{HA_FEDERATED_SO} and not $::mysqld_variables{'federated'}; -push @combinations, 'X' - if $ENV{HA_FEDERATEDX_SO} or $::mysqld_variables{'federated'}; + push @combinations, 'old' + unless $ENV{HA_FEDERATED_SO} and not $::mysqld_variables{'federated'}; + push @combinations, 'X' + unless $ENV{HA_FEDERATEDX_SO} or $::mysqld_variables{'federated'}; -return "Neither Federated nor FederatedX are available" unless @combinations; + ( 'combinations' => [ @combinations ] ) +} -$ENV{FEDERATED_COMBINATIONS}=join ':', @combinations - unless $ENV{FEDERATED_COMBINATIONS}; ############# return an object ###################### bless { }; diff --git a/mysql-test/suite/funcs_1/r/is_engines_innodb,innodb_plugin.rdiff b/mysql-test/suite/funcs_1/r/is_engines_innodb,innodb_plugin.rdiff new file mode 100644 index 00000000000..6dcdfb85e3c --- /dev/null +++ b/mysql-test/suite/funcs_1/r/is_engines_innodb,innodb_plugin.rdiff @@ -0,0 +1,11 @@ +--- suite/funcs_1/r/is_engines_innodb.result 2011-10-21 23:35:26.000000000 +0200 ++++ suite/funcs_1/r/is_engines_innodb.reject 2012-02-07 12:44:19.000000000 +0100 +@@ -2,7 +2,7 @@ + WHERE ENGINE = 'InnoDB'; + ENGINE InnoDB + SUPPORT YES +-COMMENT Percona-XtraDB, Supports transactions, row-level locking, and foreign keys ++COMMENT Supports transactions, row-level locking, and foreign keys + TRANSACTIONS YES + XA YES + SAVEPOINTS YES diff --git a/mysql-test/suite/innodb/combinations b/mysql-test/suite/innodb/combinations deleted file mode 100644 index 5051719d92a..00000000000 --- a/mysql-test/suite/innodb/combinations +++ /dev/null @@ -1,12 +0,0 @@ -[innodb_plugin] -ignore-builtin-innodb -plugin-load=$HA_INNODB_SO -innodb - -[xtradb_plugin] -ignore-builtin-innodb -plugin-load=$HA_XTRADB_SO -innodb - -[xtradb] -innodb diff --git a/mysql-test/suite/innodb/suite.pm b/mysql-test/suite/innodb/suite.pm deleted file mode 100644 index 8eccaeca019..00000000000 --- a/mysql-test/suite/innodb/suite.pm +++ /dev/null @@ -1,19 +0,0 @@ -package My::Suite::InnoDB; - -@ISA = qw(My::Suite); - -############# initialization ###################### -my @combinations; - -push @combinations, 'innodb_plugin' if $ENV{HA_INNODB_SO}; -push @combinations, 'xtradb_plugin' if $ENV{HA_XTRADB_SO} and not $::opt_embedded_server; -push @combinations, 'xtradb' if $::mysqld_variables{'innodb'} eq "ON"; - -return "Neither innodb_plugin nor xtradb are available" unless @combinations; - -$ENV{INNODB_COMBINATIONS}=join ':', @combinations - unless $ENV{INNODB_COMBINATIONS}; - -############# return an object ###################### -bless { }; - diff --git a/mysql-test/suite/innodb/t/binlog_consistent.test b/mysql-test/suite/innodb/t/binlog_consistent.test index 7502980d72a..f4babb8bad7 100644 --- a/mysql-test/suite/innodb/t/binlog_consistent.test +++ b/mysql-test/suite/innodb/t/binlog_consistent.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source include/have_log_bin.inc --source include/have_binlog_format_mixed_or_statement.inc diff --git a/mysql-test/suite/innodb/t/group_commit.test b/mysql-test/suite/innodb/t/group_commit.test index f857658d643..07aac2a619e 100644 --- a/mysql-test/suite/innodb/t/group_commit.test +++ b/mysql-test/suite/innodb/t/group_commit.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source include/have_debug_sync.inc --source include/have_log_bin.inc diff --git a/mysql-test/suite/innodb/t/group_commit_binlog_pos.test b/mysql-test/suite/innodb/t/group_commit_binlog_pos.test index 5e70db68a97..72798a68a1e 100644 --- a/mysql-test/suite/innodb/t/group_commit_binlog_pos.test +++ b/mysql-test/suite/innodb/t/group_commit_binlog_pos.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source include/have_debug_sync.inc --source include/have_log_bin.inc --source include/have_binlog_format_mixed_or_statement.inc diff --git a/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test index dba9c0589cf..e9a234577e2 100644 --- a/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source include/have_debug_sync.inc --source include/have_log_bin.inc --source include/have_binlog_format_mixed_or_statement.inc diff --git a/mysql-test/suite/innodb/t/group_commit_crash.test b/mysql-test/suite/innodb/t/group_commit_crash.test index 10b0e102bea..3502ab41180 100644 --- a/mysql-test/suite/innodb/t/group_commit_crash.test +++ b/mysql-test/suite/innodb/t/group_commit_crash.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Testing group commit by crashing a few times. # Test adapted from the Facebook patch: lp:mysqlatfacebook --source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test index 10b0e102bea..3502ab41180 100644 --- a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Testing group commit by crashing a few times. # Test adapted from the Facebook patch: lp:mysqlatfacebook --source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test index 1f821174326..7bee6b8b177 100644 --- a/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source include/have_debug_sync.inc --source include/have_log_bin.inc diff --git a/mysql-test/suite/innodb/t/innodb-analyze.test b/mysql-test/suite/innodb/t/innodb-analyze.test index c2e4410544a..0fec9968c1f 100644 --- a/mysql-test/suite/innodb/t/innodb-analyze.test +++ b/mysql-test/suite/innodb/t/innodb-analyze.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Test that mysqld does not crash when running ANALYZE TABLE with # different values of the parameter innodb_stats_sample_pages. diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-18274.test b/mysql-test/suite/innodb/t/innodb-autoinc-18274.test index 9d9ea294cb4..006982ce0af 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-18274.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-18274.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test index 7c9b7017464..07e9ca30fd6 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-56228.test b/mysql-test/suite/innodb/t/innodb-autoinc-56228.test index a0637620dea..28141f812b2 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-56228.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-56228.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc ## # Bug #56228: dropping tables from within an active statement crashes server # diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test index 2cd1449ec0f..8fc34e94076 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test b/mysql-test/suite/innodb/t/innodb-autoinc.test index 87ca1425630..4b3c3b2e56d 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/innodb-consistent.test b/mysql-test/suite/innodb/t/innodb-consistent.test index 561f31f5783..25015de018a 100644 --- a/mysql-test/suite/innodb/t/innodb-consistent.test +++ b/mysql-test/suite/innodb/t/innodb-consistent.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc -- source include/not_embedded.inc --disable_warnings diff --git a/mysql-test/suite/innodb/t/innodb-create-options.test b/mysql-test/suite/innodb/t/innodb-create-options.test index 83155897349..3215002a37c 100644 --- a/mysql-test/suite/innodb/t/innodb-create-options.test +++ b/mysql-test/suite/innodb/t/innodb-create-options.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Tests for various combinations of ROW_FORMAT and KEY_BLOCK_SIZE # Related bugs; # Bug#54679: ALTER TABLE causes compressed row_format to revert to compact diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test index 2402c74fe53..cb4527d6cb2 100644 --- a/mysql-test/suite/innodb/t/innodb-index.test +++ b/mysql-test/suite/innodb/t/innodb-index.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc let $MYSQLD_DATADIR= `select @@datadir`; diff --git a/mysql-test/suite/innodb/t/innodb-index_ucs2.test b/mysql-test/suite/innodb/t/innodb-index_ucs2.test index 84f2444ff4d..fff9a4da1a8 100644 --- a/mysql-test/suite/innodb/t/innodb-index_ucs2.test +++ b/mysql-test/suite/innodb/t/innodb-index_ucs2.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc -- source include/have_ucs2.inc -- let charset = ucs2 diff --git a/mysql-test/suite/innodb/t/innodb-lock.test b/mysql-test/suite/innodb/t/innodb-lock.test index 817b18ee6df..2c2516557ef 100644 --- a/mysql-test/suite/innodb/t/innodb-lock.test +++ b/mysql-test/suite/innodb/t/innodb-lock.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc if (`select plugin_auth_version <= "1.1.8-20.1" from information_schema.plugins where plugin_name='innodb'`) { --skip Not supported by XtraDB 1.1.8-20.1 or earlier diff --git a/mysql-test/suite/innodb/t/innodb-replace.test b/mysql-test/suite/innodb/t/innodb-replace.test index 20ca8e98ce2..8c3aacde5e8 100644 --- a/mysql-test/suite/innodb/t/innodb-replace.test +++ b/mysql-test/suite/innodb/t/innodb-replace.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/innodb-semi-consistent.test b/mysql-test/suite/innodb/t/innodb-semi-consistent.test index 6036aa3ed9c..2551db99cf3 100644 --- a/mysql-test/suite/innodb/t/innodb-semi-consistent.test +++ b/mysql-test/suite/innodb/t/innodb-semi-consistent.test @@ -1,4 +1,5 @@ -- source include/not_embedded.inc +-- source include/have_innodb.inc --disable_warnings drop table if exists t1,t2; diff --git a/mysql-test/suite/innodb/t/innodb-timeout.test b/mysql-test/suite/innodb/t/innodb-timeout.test index 07d03093b63..0beeea8f39e 100644 --- a/mysql-test/suite/innodb/t/innodb-timeout.test +++ b/mysql-test/suite/innodb/t/innodb-timeout.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc let $initial_timeout=`select @@innodb_lock_wait_timeout`; set global innodb_lock_wait_timeout=42; diff --git a/mysql-test/suite/innodb/t/innodb-truncate.test b/mysql-test/suite/innodb/t/innodb-truncate.test index b01ff545e1a..ae25aabd323 100644 --- a/mysql-test/suite/innodb/t/innodb-truncate.test +++ b/mysql-test/suite/innodb/t/innodb-truncate.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --echo # --echo # TRUNCATE TABLE --echo # diff --git a/mysql-test/suite/innodb/t/innodb-ucs2.test b/mysql-test/suite/innodb/t/innodb-ucs2.test index 1b59d4aa32e..010d27ab851 100644 --- a/mysql-test/suite/innodb/t/innodb-ucs2.test +++ b/mysql-test/suite/innodb/t/innodb-ucs2.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc -- source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test index 6561feffdd4..39a094d0359 100644 --- a/mysql-test/suite/innodb/t/innodb-zip.test +++ b/mysql-test/suite/innodb/t/innodb-zip.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc let $per_table=`select @@innodb_file_per_table`; let $format=`select @@innodb_file_format`; diff --git a/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test b/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test index 7d2e94c296d..07f096b2c23 100644 --- a/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test +++ b/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This test runs with old-style locking, as: # --innodb-autoinc-lock-mode=0 diff --git a/mysql-test/suite/innodb/t/innodb_bug21704.test b/mysql-test/suite/innodb/t/innodb_bug21704.test index a1dbc8eb734..67d76587819 100644 --- a/mysql-test/suite/innodb/t/innodb_bug21704.test +++ b/mysql-test/suite/innodb/t/innodb_bug21704.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --echo # --echo # Bug#21704: Renaming column does not update FK definition. --echo # diff --git a/mysql-test/suite/innodb/t/innodb_bug30423.test b/mysql-test/suite/innodb/t/innodb_bug30423.test index 9e4156f1cf8..bbb6f1155ff 100644 --- a/mysql-test/suite/innodb/t/innodb_bug30423.test +++ b/mysql-test/suite/innodb/t/innodb_bug30423.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Test for Bug #30423, InnoDBs treatment of NULL in index stats causes # bad "rows examined" estimates. # Implemented InnoDB system variable "innodb_stats_method" with diff --git a/mysql-test/suite/innodb/t/innodb_bug30919.test b/mysql-test/suite/innodb/t/innodb_bug30919.test index 84435ad3312..56b2c7bc03d 100644 --- a/mysql-test/suite/innodb/t/innodb_bug30919.test +++ b/mysql-test/suite/innodb/t/innodb_bug30919.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source include/have_partition.inc --vertical_results let $engine_type= 'innodb'; diff --git a/mysql-test/suite/innodb/t/innodb_bug34053.test b/mysql-test/suite/innodb/t/innodb_bug34053.test index 2025a029613..b935e45c06d 100644 --- a/mysql-test/suite/innodb/t/innodb_bug34053.test +++ b/mysql-test/suite/innodb/t/innodb_bug34053.test @@ -3,6 +3,7 @@ # -- source include/not_embedded.inc +-- source include/have_innodb.inc SET storage_engine=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug34300.test b/mysql-test/suite/innodb/t/innodb_bug34300.test index 09ab23eb4f4..3f496741c6a 100644 --- a/mysql-test/suite/innodb/t/innodb_bug34300.test +++ b/mysql-test/suite/innodb/t/innodb_bug34300.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#34300 Tinyblob & tinytext fields currupted after export/import and alter in 5.1 # http://bugs.mysql.com/34300 diff --git a/mysql-test/suite/innodb/t/innodb_bug35220.test b/mysql-test/suite/innodb/t/innodb_bug35220.test index 4388cfd2a85..29c432fe987 100644 --- a/mysql-test/suite/innodb/t/innodb_bug35220.test +++ b/mysql-test/suite/innodb/t/innodb_bug35220.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#35220 ALTER TABLE too picky on reserved word "foreign" # http://bugs.mysql.com/35220 diff --git a/mysql-test/suite/innodb/t/innodb_bug36169.test b/mysql-test/suite/innodb/t/innodb_bug36169.test index 0695413266b..6426bd683ae 100644 --- a/mysql-test/suite/innodb/t/innodb_bug36169.test +++ b/mysql-test/suite/innodb/t/innodb_bug36169.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#36169 create innodb compressed table with too large row size crashed # http://bugs.mysql.com/36169 diff --git a/mysql-test/suite/innodb/t/innodb_bug36172.test b/mysql-test/suite/innodb/t/innodb_bug36172.test index 30be4873df0..015f461e532 100644 --- a/mysql-test/suite/innodb/t/innodb_bug36172.test +++ b/mysql-test/suite/innodb/t/innodb_bug36172.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Test case for bug 36172 # diff --git a/mysql-test/suite/innodb/t/innodb_bug38231.test b/mysql-test/suite/innodb/t/innodb_bug38231.test index db338324da3..ba4e1c62e06 100644 --- a/mysql-test/suite/innodb/t/innodb_bug38231.test +++ b/mysql-test/suite/innodb/t/innodb_bug38231.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#38231 Innodb crash in lock_reset_all_on_table() on TRUNCATE + LOCK / UNLOCK # http://bugs.mysql.com/38231 diff --git a/mysql-test/suite/innodb/t/innodb_bug39438.test b/mysql-test/suite/innodb/t/innodb_bug39438.test index 6f57ef17ab3..3a838da8419 100644 --- a/mysql-test/suite/innodb/t/innodb_bug39438.test +++ b/mysql-test/suite/innodb/t/innodb_bug39438.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#39438 Testcase for Bug#39436 crashes on 5.1 in fil_space_get_latch # http://bugs.mysql.com/39438 diff --git a/mysql-test/suite/innodb/t/innodb_bug40360.test b/mysql-test/suite/innodb/t/innodb_bug40360.test index a6b67b03c6f..f5187d55092 100644 --- a/mysql-test/suite/innodb/t/innodb_bug40360.test +++ b/mysql-test/suite/innodb/t/innodb_bug40360.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Make sure http://bugs.mysql.com/40360 remains fixed. # diff --git a/mysql-test/suite/innodb/t/innodb_bug40565.test b/mysql-test/suite/innodb/t/innodb_bug40565.test index 4d4ee6811d7..a5d1434626c 100644 --- a/mysql-test/suite/innodb/t/innodb_bug40565.test +++ b/mysql-test/suite/innodb/t/innodb_bug40565.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Bug #40565 Update Query Results in "1 Row Affected" But Should Be "Zero Rows" create table bug40565(value decimal(4,2)) engine=innodb; diff --git a/mysql-test/suite/innodb/t/innodb_bug41904.test b/mysql-test/suite/innodb/t/innodb_bug41904.test index 0aac1c840c3..4b45128df2a 100644 --- a/mysql-test/suite/innodb/t/innodb_bug41904.test +++ b/mysql-test/suite/innodb/t/innodb_bug41904.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Make sure http://bugs.mysql.com/41904 remains fixed. # diff --git a/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test b/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test index 96c28db8ede..3ee3f1e6a8b 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test +++ b/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#42101 Race condition in innodb_commit_concurrency # http://bugs.mysql.com/42101 diff --git a/mysql-test/suite/innodb/t/innodb_bug42101.test b/mysql-test/suite/innodb/t/innodb_bug42101.test index 2603ff1e682..374d3e6b5f5 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42101.test +++ b/mysql-test/suite/innodb/t/innodb_bug42101.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#42101 Race condition in innodb_commit_concurrency # http://bugs.mysql.com/42101 diff --git a/mysql-test/suite/innodb/t/innodb_bug42419.test b/mysql-test/suite/innodb/t/innodb_bug42419.test index 43e9ada96db..788437b0394 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42419.test +++ b/mysql-test/suite/innodb/t/innodb_bug42419.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Testcase for InnoDB # Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections diff --git a/mysql-test/suite/innodb/t/innodb_bug44032.test b/mysql-test/suite/innodb/t/innodb_bug44032.test index 74c4b1dcb04..0016749619d 100644 --- a/mysql-test/suite/innodb/t/innodb_bug44032.test +++ b/mysql-test/suite/innodb/t/innodb_bug44032.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Bug44032 no update-in-place of UTF-8 columns in ROW_FORMAT=REDUNDANT # (btr_cur_update_in_place not invoked when updating from/to NULL; # the update is performed by delete and insert instead) diff --git a/mysql-test/suite/innodb/t/innodb_bug44369.test b/mysql-test/suite/innodb/t/innodb_bug44369.test index 2d9304567f8..caa4eed3c37 100644 --- a/mysql-test/suite/innodb/t/innodb_bug44369.test +++ b/mysql-test/suite/innodb/t/innodb_bug44369.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug 44369. We should # block table creation with columns match # some innodb internal reserved key words, diff --git a/mysql-test/suite/innodb/t/innodb_bug44571.test b/mysql-test/suite/innodb/t/innodb_bug44571.test index d0868659910..e27ed0b9bf8 100644 --- a/mysql-test/suite/innodb/t/innodb_bug44571.test +++ b/mysql-test/suite/innodb/t/innodb_bug44571.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#44571 InnoDB Plugin crashes on ADD INDEX # http://bugs.mysql.com/44571 diff --git a/mysql-test/suite/innodb/t/innodb_bug45357.test b/mysql-test/suite/innodb/t/innodb_bug45357.test index 524ee85c6ba..8294bfe6f34 100644 --- a/mysql-test/suite/innodb/t/innodb_bug45357.test +++ b/mysql-test/suite/innodb/t/innodb_bug45357.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc set session transaction isolation level read committed; diff --git a/mysql-test/suite/innodb/t/innodb_bug46000.test b/mysql-test/suite/innodb/t/innodb_bug46000.test index 95b9ff4dcc9..3dcfa85a135 100644 --- a/mysql-test/suite/innodb/t/innodb_bug46000.test +++ b/mysql-test/suite/innodb/t/innodb_bug46000.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug 46000. We shall # block any index creation with the name of # "GEN_CLUST_INDEX", which is the reserved diff --git a/mysql-test/suite/innodb/t/innodb_bug46676.test b/mysql-test/suite/innodb/t/innodb_bug46676.test index 27bd1dcd6dc..fdea70c6855 100644 --- a/mysql-test/suite/innodb/t/innodb_bug46676.test +++ b/mysql-test/suite/innodb/t/innodb_bug46676.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug 46676: mysqld got exception 0xc0000005 # It is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37. # But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5). diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test index dee2ac26f8b..a7e1e607cd8 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47167.test +++ b/mysql-test/suite/innodb/t/innodb_bug47167.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the unit test for bug #47167. # It tests setting the global variable "innodb_file_format_max" ( # originally "innodb_file_format_check") with a user-Defined Variable. diff --git a/mysql-test/suite/innodb/t/innodb_bug47621.test b/mysql-test/suite/innodb/t/innodb_bug47621.test index 80b42bc738b..64a6ff761ea 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47621.test +++ b/mysql-test/suite/innodb/t/innodb_bug47621.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug #47621, column rename operation should # not result in column definition inconsistency between MySQL and # InnoDB diff --git a/mysql-test/suite/innodb/t/innodb_bug47622.test b/mysql-test/suite/innodb/t/innodb_bug47622.test index 45cf4d5ec4d..2ebf9a627f1 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47622.test +++ b/mysql-test/suite/innodb/t/innodb_bug47622.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug 47622. There could be index # metadata sequence mismatch between MySQL and Innodb # after creating index through FIC interfaces. diff --git a/mysql-test/suite/innodb/t/innodb_bug47777.test b/mysql-test/suite/innodb/t/innodb_bug47777.test index 52d975901de..d00509c3814 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47777.test +++ b/mysql-test/suite/innodb/t/innodb_bug47777.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug 47777. GEOMETRY # data is treated as BLOB data in innodb. # Consequently, its key value generation/storing diff --git a/mysql-test/suite/innodb/t/innodb_bug48024.test b/mysql-test/suite/innodb/t/innodb_bug48024.test index aa7dd8dbf10..db828aa1cda 100644 --- a/mysql-test/suite/innodb/t/innodb_bug48024.test +++ b/mysql-test/suite/innodb/t/innodb_bug48024.test @@ -1,5 +1,6 @@ # Bug #48024 Innodb doesn't work with multi-statements +--source include/have_innodb.inc CREATE TABLE bug48024(a int PRIMARY KEY,b int NOT NULL,KEY(b)) ENGINE=InnoDB; CREATE TABLE bug48024_b(b int PRIMARY KEY) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug49164.test b/mysql-test/suite/innodb/t/innodb_bug49164.test index 96d59da02f2..159475ba10f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug49164.test +++ b/mysql-test/suite/innodb/t/innodb_bug49164.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Bug #49164 READ-COMMITTED reports "matched: 0" on compound PK # a duplicate of diff --git a/mysql-test/suite/innodb/t/innodb_bug51378.test b/mysql-test/suite/innodb/t/innodb_bug51378.test index c171bae04ae..e11c3c0053e 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51378.test +++ b/mysql-test/suite/innodb/t/innodb_bug51378.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug 51378. Unique index created # through "create index" and "alter table add unique index" # interfaces should not be treated as primary index if indexed diff --git a/mysql-test/suite/innodb/t/innodb_bug51920.test b/mysql-test/suite/innodb/t/innodb_bug51920.test index 41c52bbd89b..0d4715712b0 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51920.test +++ b/mysql-test/suite/innodb/t/innodb_bug51920.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #51920: InnoDB connections in lock wait ignore KILL until timeout # diff --git a/mysql-test/suite/innodb/t/innodb_bug52199.test b/mysql-test/suite/innodb/t/innodb_bug52199.test index b95cdef3fdd..d78a53be4c3 100644 --- a/mysql-test/suite/innodb/t/innodb_bug52199.test +++ b/mysql-test/suite/innodb/t/innodb_bug52199.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc let collation=utf32_bin; --source include/have_collation.inc diff --git a/mysql-test/suite/innodb/t/innodb_bug52663.test b/mysql-test/suite/innodb/t/innodb_bug52663.test index e4e87ee33d8..fcf97531e00 100644 --- a/mysql-test/suite/innodb/t/innodb_bug52663.test +++ b/mysql-test/suite/innodb/t/innodb_bug52663.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc set session transaction isolation level read committed; diff --git a/mysql-test/suite/innodb/t/innodb_bug52745.test b/mysql-test/suite/innodb/t/innodb_bug52745.test index 252de1e2794..58bcc264677 100644 --- a/mysql-test/suite/innodb/t/innodb_bug52745.test +++ b/mysql-test/suite/innodb/t/innodb_bug52745.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc let $file_format=`select @@innodb_file_format`; let $file_per_table=`select @@innodb_file_per_table`; diff --git a/mysql-test/suite/innodb/t/innodb_bug53046.test b/mysql-test/suite/innodb/t/innodb_bug53046.test index d531a9d2284..dddff8a235f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53046.test +++ b/mysql-test/suite/innodb/t/innodb_bug53046.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # http://bugs.mysql.com/53046 # dict_update_statistics_low can still be run concurrently on same table diff --git a/mysql-test/suite/innodb/t/innodb_bug53290.test b/mysql-test/suite/innodb/t/innodb_bug53290.test index 90e23127d64..ea15212fa39 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53290.test +++ b/mysql-test/suite/innodb/t/innodb_bug53290.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc create table bug53290 (x bigint) engine=innodb; diff --git a/mysql-test/suite/innodb/t/innodb_bug53591.test b/mysql-test/suite/innodb/t/innodb_bug53591.test index 3261779a825..9a1c2afbccb 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53591.test +++ b/mysql-test/suite/innodb/t/innodb_bug53591.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc let $file_format=`select @@innodb_file_format`; let $file_per_table=`select @@innodb_file_per_table`; diff --git a/mysql-test/suite/innodb/t/innodb_bug53592.test b/mysql-test/suite/innodb/t/innodb_bug53592.test index 7eefe6d7631..2f901d7eb99 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53592.test +++ b/mysql-test/suite/innodb/t/innodb_bug53592.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Testcase for Bug #53592 - "crash replacing duplicates into # table after fast alter table added unique key". The fix is to make # sure index number lookup should go through "index translation table". diff --git a/mysql-test/suite/innodb/t/innodb_bug53674.test b/mysql-test/suite/innodb/t/innodb_bug53674.test index c2d11b953e6..f89c3d473e9 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53674.test +++ b/mysql-test/suite/innodb/t/innodb_bug53674.test @@ -1,4 +1,5 @@ -- source include/have_log_bin.inc +-- source include/have_innodb.inc create table bug53674(a int)engine=innodb; insert into bug53674 values (1),(2); diff --git a/mysql-test/suite/innodb/t/innodb_bug53756.test b/mysql-test/suite/innodb/t/innodb_bug53756.test index ba66c9d8eb3..2f778d45f61 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53756.test +++ b/mysql-test/suite/innodb/t/innodb_bug53756.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test case for bug #53756. Alter table operation could # leave a deleted record for the temp table (later renamed to the altered # table) in the SYS_TABLES secondary index, we should ignore this row and diff --git a/mysql-test/suite/innodb/t/innodb_bug54044.test b/mysql-test/suite/innodb/t/innodb_bug54044.test index 4b6341d2412..013a7ff1e93 100644 --- a/mysql-test/suite/innodb/t/innodb_bug54044.test +++ b/mysql-test/suite/innodb/t/innodb_bug54044.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type # during create table, so it will not trigger assertion failure. diff --git a/mysql-test/suite/innodb/t/innodb_bug56143.test b/mysql-test/suite/innodb/t/innodb_bug56143.test index ef75ab8281f..fa04b2e4262 100644 --- a/mysql-test/suite/innodb/t/innodb_bug56143.test +++ b/mysql-test/suite/innodb/t/innodb_bug56143.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#56143 too many foreign keys causes output of show create table to become invalid # http://bugs.mysql.com/56143 diff --git a/mysql-test/suite/innodb/t/innodb_bug56680.test b/mysql-test/suite/innodb/t/innodb_bug56680.test index 1fcf55add60..f592bd16942 100644 --- a/mysql-test/suite/innodb/t/innodb_bug56680.test +++ b/mysql-test/suite/innodb/t/innodb_bug56680.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #56680 InnoDB may return wrong results from a case-insensitive index # diff --git a/mysql-test/suite/innodb/t/innodb_bug56716.test b/mysql-test/suite/innodb/t/innodb_bug56716.test index e297b627dcb..47fdac3e150 100644 --- a/mysql-test/suite/innodb/t/innodb_bug56716.test +++ b/mysql-test/suite/innodb/t/innodb_bug56716.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #56716 InnoDB locks a record gap without locking the table # diff --git a/mysql-test/suite/innodb/t/innodb_bug56947.test b/mysql-test/suite/innodb/t/innodb_bug56947.test index b1aca4efd4f..b6feb239314 100644 --- a/mysql-test/suite/innodb/t/innodb_bug56947.test +++ b/mysql-test/suite/innodb/t/innodb_bug56947.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #56947 valgrind reports a memory leak in innodb-plugin.innodb-index # diff --git a/mysql-test/suite/innodb/t/innodb_bug57252.test b/mysql-test/suite/innodb/t/innodb_bug57252.test index 996533feabe..5a4ca1ab6d8 100644 --- a/mysql-test/suite/innodb/t/innodb_bug57252.test +++ b/mysql-test/suite/innodb/t/innodb_bug57252.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug#57252 disabling innobase_stats_on_metadata disables ANALYZE # http://bugs.mysql.com/57252 diff --git a/mysql-test/suite/innodb/t/innodb_bug57255.test b/mysql-test/suite/innodb/t/innodb_bug57255.test index 27e0a1af1a0..cf7982a6ddf 100644 --- a/mysql-test/suite/innodb/t/innodb_bug57255.test +++ b/mysql-test/suite/innodb/t/innodb_bug57255.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Test Bug #57255. Cascade deletes that affect different rows should not # result in DB_FOREIGN_EXCEED_MAX_CASCADE error diff --git a/mysql-test/suite/innodb/t/innodb_bug57904.test b/mysql-test/suite/innodb/t/innodb_bug57904.test index 0669a2e53a5..48dc5254b26 100755 --- a/mysql-test/suite/innodb/t/innodb_bug57904.test +++ b/mysql-test/suite/innodb/t/innodb_bug57904.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #57904 Missing constraint from information schema REFERENTIAL_CONSTRAINTS table # diff --git a/mysql-test/suite/innodb/t/innodb_bug59410.test b/mysql-test/suite/innodb/t/innodb_bug59410.test index 89d3f1a0637..30bb0642679 100644 --- a/mysql-test/suite/innodb/t/innodb_bug59410.test +++ b/mysql-test/suite/innodb/t/innodb_bug59410.test @@ -1,6 +1,8 @@ # # Bug#59410 read uncommitted: unlock row could not find a 3 mode lock on the record # +-- source include/have_innodb.inc + # only interested that the following do not produce something like # InnoDB: Error: unlock row could not find a 2 mode lock on the record # in the error log diff --git a/mysql-test/suite/innodb/t/innodb_bug59641.test b/mysql-test/suite/innodb/t/innodb_bug59641.test index 94b9ed8f9ed..a8d35cd1029 100644 --- a/mysql-test/suite/innodb/t/innodb_bug59641.test +++ b/mysql-test/suite/innodb/t/innodb_bug59641.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Bug #59641 Prepared XA transaction causes shutdown hang after a crash -- source include/not_embedded.inc diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test index 10a6f3032ba..19c7fad484d 100644 --- a/mysql-test/suite/innodb/t/innodb_bug60049.test +++ b/mysql-test/suite/innodb/t/innodb_bug60049.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Bug #60049 Verify that purge leaves no garbage in unique secondary indexes # This test requires a fresh server start-up and a slow shutdown. # This was a suspected bug (not a bug). diff --git a/mysql-test/suite/innodb/t/innodb_bug60196.test b/mysql-test/suite/innodb/t/innodb_bug60196.test index 6e2974fd4f8..fcef3196845 100755 --- a/mysql-test/suite/innodb/t/innodb_bug60196.test +++ b/mysql-test/suite/innodb/t/innodb_bug60196.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Bug#60196 - Setting lowercase_table_names to 2 on Windows causing # Foreign Key problems after an engine is restarted. diff --git a/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test b/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test index 827bb4bcc74..c9a0237fa5f 100644 --- a/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test +++ b/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc if (`select plugin_auth_version <= "1.1.8-20.1" from information_schema.plugins where plugin_name='innodb'`) { --skip Not supported by XtraDB 1.1.8-20.1 or earlier diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test index f3b135f39bd..e6c442f80dc 100644 --- a/mysql-test/suite/innodb/t/innodb_file_format.test +++ b/mysql-test/suite/innodb/t/innodb_file_format.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --source suite/innodb/include/restart_and_reinit.inc let $innodb_file_format_orig=`select @@innodb_file_format`; diff --git a/mysql-test/suite/innodb/t/innodb_gis.test b/mysql-test/suite/innodb/t/innodb_gis.test index dec0c8bf725..1adb14ea482 100644 --- a/mysql-test/suite/innodb/t/innodb_gis.test +++ b/mysql-test/suite/innodb/t/innodb_gis.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc SET storage_engine=innodb; --source include/gis_generic.inc --source include/gis_keys.inc diff --git a/mysql-test/suite/innodb/t/innodb_index_large_prefix.test b/mysql-test/suite/innodb/t/innodb_index_large_prefix.test index 2ae0237488c..6873c2a404c 100644 --- a/mysql-test/suite/innodb/t/innodb_index_large_prefix.test +++ b/mysql-test/suite/innodb/t/innodb_index_large_prefix.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # Testcase for worklog #5743: Lift the limit of index key prefixes let $innodb_file_format_orig=`select @@innodb_file_format`; diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test index 05fb67edf75..205344a1cd7 100644 --- a/mysql-test/suite/innodb/t/innodb_information_schema.test +++ b/mysql-test/suite/innodb/t/innodb_information_schema.test @@ -3,6 +3,7 @@ # INFORMATION_SCHEMA.innodb_locks.lock_data # +-- source include/have_innodb.inc -- disable_query_log -- disable_result_log diff --git a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test index 5a0aaa86d4c..f6f65391b82 100644 --- a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test +++ b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc --echo # --echo # Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout diff --git a/mysql-test/suite/innodb/t/innodb_multi_update.test b/mysql-test/suite/innodb/t/innodb_multi_update.test index e15f7470960..73ca0ba51dd 100644 --- a/mysql-test/suite/innodb/t/innodb_multi_update.test +++ b/mysql-test/suite/innodb/t/innodb_multi_update.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Test multi update with different join methods diff --git a/mysql-test/suite/innodb/t/innodb_mysql.test b/mysql-test/suite/innodb/t/innodb_mysql.test index 378df7fdcd8..3ae5be3aa30 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql.test +++ b/mysql-test/suite/innodb/t/innodb_mysql.test @@ -7,6 +7,7 @@ # Slow test, don't run during staging part -- source include/not_staging.inc +-- source include/have_innodb.inc -- source include/have_query_cache.inc let $engine_type= InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_mysql_rbk.test b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test index e565bff16de..85a9769732f 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql_rbk.test +++ b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #41453: Assertion `m_status == DA_ERROR' failed in diff --git a/mysql-test/suite/innodb/t/innodb_notembedded.test b/mysql-test/suite/innodb/t/innodb_notembedded.test index 1caccdbc32b..79f5606ed6b 100644 --- a/mysql-test/suite/innodb/t/innodb_notembedded.test +++ b/mysql-test/suite/innodb/t/innodb_notembedded.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc -- source include/not_embedded.inc --disable_warnings diff --git a/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test b/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test index c702b59e81f..ecd34d00c4d 100644 --- a/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test +++ b/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc ######## suite/innodb/t/innodb_prefix_index_liftedlimit.test ########## # # # Testcase for worklog WL#5743: Lift the limit of index key prefixes # diff --git a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test index 1f54a9b253d..21a5753e909 100644 --- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test +++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test @@ -1,3 +1,4 @@ +--source include/have_innodb.inc ######## suite/innodb/t/innodb_prefix_iindex_restart_server.test ##### # # # Testcase for worklog WL#5743: Lift the limit of index key prefixes # diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.test b/mysql-test/suite/innodb/t/innodb_trx_weight.test index b2583ff3a8a..b72eaad345f 100644 --- a/mysql-test/suite/innodb/t/innodb_trx_weight.test +++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test @@ -6,6 +6,7 @@ # be heavier than ones that had not. # +-- source include/have_innodb.inc SET storage_engine=InnoDB; diff --git a/mysql-test/suite/percona/innodb_fix_misc_bug51325.test b/mysql-test/suite/percona/innodb_fix_misc_bug51325.test index 78d6e60046a..54fa3a80179 100644 --- a/mysql-test/suite/percona/innodb_fix_misc_bug51325.test +++ b/mysql-test/suite/percona/innodb_fix_misc_bug51325.test @@ -1,5 +1,5 @@ # Test for 'innodb_lazy_drop_table' variable ---source include/have_innodb.inc +--source include/have_xtradb.inc --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes.test b/mysql-test/suite/percona/percona_innodb_fake_changes.test index fd231ae096f..5fa3ecc7b63 100644 --- a/mysql-test/suite/percona/percona_innodb_fake_changes.test +++ b/mysql-test/suite/percona/percona_innodb_fake_changes.test @@ -1,4 +1,4 @@ ---source include/have_innodb.inc +--source include/have_xtradb.inc --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test b/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test index e298405cd43..ce15fc0bf43 100644 --- a/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test +++ b/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test @@ -1,4 +1,4 @@ ---source include/have_innodb.inc +--source include/have_xtradb.inc --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/rpl/t/rpl_binlog_grant.test b/mysql-test/suite/rpl/t/rpl_binlog_grant.test index 839399dea63..26ebb29ae8d 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_grant.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_grant.test @@ -1,7 +1,7 @@ -source include/master-slave.inc; -- source include/have_innodb.inc -- source include/not_embedded.inc -- source include/have_binlog_format_mixed_or_statement.inc +source include/master-slave.inc; let $VERSION=`select version()`; diff --git a/mysql-test/suite/rpl/t/rpl_ddl.test b/mysql-test/suite/rpl/t/rpl_ddl.test index 83a530131a6..f9a353f87ac 100644 --- a/mysql-test/suite/rpl/t/rpl_ddl.test +++ b/mysql-test/suite/rpl/t/rpl_ddl.test @@ -23,8 +23,8 @@ # abort of the test case etc.. # --source include/not_ndb_default.inc ---source include/master-slave.inc --source include/have_innodb.inc +--source include/master-slave.inc let $engine_type= InnoDB; let $temp_engine_type= MEMORY; let $show_binlog = 0; diff --git a/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test index c2cb4cb47bb..18076cfef7f 100644 --- a/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test @@ -3,6 +3,7 @@ # --source include/not_embedded.inc --source include/have_innodb.inc +--source suite/innodb/include/restart_and_reinit.inc SET @start_global_value = @@global.innodb_file_format_max; SELECT @start_global_value; |