diff options
Diffstat (limited to 'mysql-test/suite/innodb')
74 files changed, 49 insertions, 133 deletions
diff --git a/mysql-test/suite/innodb/combinations b/mysql-test/suite/innodb/combinations new file mode 100644 index 00000000000..5051719d92a --- /dev/null +++ b/mysql-test/suite/innodb/combinations @@ -0,0 +1,12 @@ +[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/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index a721b42f2b7..fd7cf87d138 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -1574,12 +1574,6 @@ ERROR 42S21: Duplicate column name 'c1' alter table t1 add key (c1,c1,c2); ERROR 42S21: Duplicate column name 'c1' drop table t1; -create table t1(a int(1) , b int(1)) engine=innodb; -insert into t1 values ('1111', '3333'); -select distinct concat(a, b) from t1; -concat(a, b) -11113333 -drop table t1; CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB; SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE); ERROR HY000: The used table type doesn't support FULLTEXT indexes @@ -1714,7 +1708,6 @@ show variables like "innodb_sync_spin_loops"; Variable_name Value innodb_sync_spin_loops 20 set global innodb_sync_spin_loops=@innodb_sync_spin_loops_orig; -SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency; show variables like "innodb_thread_concurrency"; Variable_name Value innodb_thread_concurrency 0 @@ -1732,7 +1725,6 @@ set global innodb_thread_concurrency=16; show variables like "innodb_thread_concurrency"; Variable_name Value innodb_thread_concurrency 16 -SET @@global.innodb_thread_concurrency= @old_innodb_thread_concurrency; show variables like "innodb_concurrency_tickets"; Variable_name Value innodb_concurrency_tickets 500 @@ -3185,5 +3177,3 @@ Variable_name Value Handler_update 1 Variable_name Value Handler_delete 1 -set optimizer_switch='index_condition_pushdown=default'; -set @@optimizer_use_mrr=default; diff --git a/mysql-test/suite/innodb/r/innodb_bug53591.result b/mysql-test/suite/innodb/r/innodb_bug53591.result index 89aeb84a880..8573fb60718 100644 --- a/mysql-test/suite/innodb/r/innodb_bug53591.result +++ b/mysql-test/suite/innodb/r/innodb_bug53591.result @@ -9,6 +9,7 @@ SHOW WARNINGS; Level Code Message Error 139 Too big row Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs +Error 1030 Got error 139 from storage engine DROP TABLE bug53591; SET GLOBAL innodb_file_format=Barracuda; SET GLOBAL innodb_file_format_max=Antelope; diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index f290410a488..2b4c25dab0d 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -2677,7 +2677,7 @@ WHERE t2.i = t1.pk AND t1.pk BETWEEN 0 AND 224 HAVING f > 7 ORDER BY f; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 3 Using where; Using filesort +1 SIMPLE t1 index PRIMARY idx 5 NULL 6 Using where; Using index 1 SIMPLE t2 ref idx idx 5 test.t1.pk 1 Using index SELECT t1 .i AS f FROM t1, t2 WHERE t2.i = t1.pk AND t1.pk BETWEEN 0 AND 224 diff --git a/mysql-test/suite/innodb/suite.pm b/mysql-test/suite/innodb/suite.pm new file mode 100644 index 00000000000..9accba5b8a1 --- /dev/null +++ b/mysql-test/suite/innodb/suite.pm @@ -0,0 +1,19 @@ +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}; +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/disabled.def b/mysql-test/suite/innodb/t/disabled.def index 888298bbb09..8cae44a3607 100644 --- a/mysql-test/suite/innodb/t/disabled.def +++ b/mysql-test/suite/innodb/t/disabled.def @@ -9,3 +9,4 @@ # Do not use any TAB characters for whitespace. # ############################################################################## + diff --git a/mysql-test/suite/innodb/t/innodb-analyze.test b/mysql-test/suite/innodb/t/innodb-analyze.test index 9bdb9db697c..c2e4410544a 100644 --- a/mysql-test/suite/innodb/t/innodb-analyze.test +++ b/mysql-test/suite/innodb/t/innodb-analyze.test @@ -3,8 +3,6 @@ # different values of the parameter innodb_stats_sample_pages. # --- source include/have_innodb.inc - # we care only that the following SQL commands do not produce errors # and do not crash the server -- disable_query_log diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test index 790646fe13b..6bcc901a878 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test @@ -1,4 +1,3 @@ --- 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-optimize.test b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test index 0f0cb57f92f..2cd1449ec0f 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test @@ -1,4 +1,3 @@ --- 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 2f51cf9ef12..84c359a6bde 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc @@ -665,20 +664,17 @@ SELECT * FROM t1; SHOW CREATE TABLE t1; DROP TABLE t1; +## +# 55277: Failing assertion: auto_inc > 0 +# DROP TABLE IF EXISTS t1; -Warnings: -Note 1051 Unknown table 't1' CREATE TABLE t1(c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (NULL); INSERT INTO t1 VALUES (18446744073709551615); +# Restart the server +-- source include/restart_mysqld.inc SHOW CREATE TABLE t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `c1` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`c1`) -) ENGINE=InnoDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 DROP TABLE t1; - # # restore environment to the state it was before this test execution # diff --git a/mysql-test/suite/innodb/t/innodb-consistent.test b/mysql-test/suite/innodb/t/innodb-consistent.test index bf829a74ea2..561f31f5783 100644 --- a/mysql-test/suite/innodb/t/innodb-consistent.test +++ b/mysql-test/suite/innodb/t/innodb-consistent.test @@ -1,5 +1,4 @@ -- source include/not_embedded.inc --- source include/have_innodb.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test index 05d1d37c422..26de072f08b 100644 --- a/mysql-test/suite/innodb/t/innodb-index.test +++ b/mysql-test/suite/innodb/t/innodb-index.test @@ -1,4 +1,3 @@ --- 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 fff9a4da1a8..84f2444ff4d 100644 --- a/mysql-test/suite/innodb/t/innodb-index_ucs2.test +++ b/mysql-test/suite/innodb/t/innodb-index_ucs2.test @@ -1,4 +1,3 @@ --- 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 96f555e3ecc..05501ec0d03 100644 --- a/mysql-test/suite/innodb/t/innodb-lock.test +++ b/mysql-test/suite/innodb/t/innodb-lock.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc # # Check and select innodb lock type diff --git a/mysql-test/suite/innodb/t/innodb-replace.test b/mysql-test/suite/innodb/t/innodb-replace.test index 8c3aacde5e8..20ca8e98ce2 100644 --- a/mysql-test/suite/innodb/t/innodb-replace.test +++ b/mysql-test/suite/innodb/t/innodb-replace.test @@ -1,4 +1,3 @@ --- 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 2551db99cf3..6036aa3ed9c 100644 --- a/mysql-test/suite/innodb/t/innodb-semi-consistent.test +++ b/mysql-test/suite/innodb/t/innodb-semi-consistent.test @@ -1,5 +1,4 @@ -- 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-system-table-view.test b/mysql-test/suite/innodb/t/innodb-system-table-view.test index e570a33b59d..904087577c8 100644 --- a/mysql-test/suite/innodb/t/innodb-system-table-view.test +++ b/mysql-test/suite/innodb/t/innodb-system-table-view.test @@ -2,7 +2,6 @@ # that displays the InnoDB system table content through # information schema tables. ---source include/have_innodb.inc SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES; diff --git a/mysql-test/suite/innodb/t/innodb-timeout.test b/mysql-test/suite/innodb/t/innodb-timeout.test index f23fe3cff2d..fd839540667 100644 --- a/mysql-test/suite/innodb/t/innodb-timeout.test +++ b/mysql-test/suite/innodb/t/innodb-timeout.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc let $timeout=`select @@innodb_lock_wait_timeout`; set global innodb_lock_wait_timeout=42; diff --git a/mysql-test/suite/innodb/t/innodb-ucs2.test b/mysql-test/suite/innodb/t/innodb-ucs2.test index 7b91ef37d3f..1b59d4aa32e 100644 --- a/mysql-test/suite/innodb/t/innodb-ucs2.test +++ b/mysql-test/suite/innodb/t/innodb-ucs2.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc -- source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt b/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt index 041b063645b..41ac793df88 100644 --- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt +++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt @@ -1,3 +1,2 @@ --default-storage-engine=MyISAM --loose-innodb-use-sys-malloc=true ---loose-innodb-use-sys-malloc=true diff --git a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test index 07ccf261713..c485755378c 100644 --- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test +++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test @@ -1,4 +1,3 @@ ---source include/have_innodb.inc # XtraDB has lots of "still reachable" memory leak warnings at shutdown when # --innodb-use-sys-malloc --source include/not_valgrind.inc @@ -25,27 +24,4 @@ create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; insert into t1 values (1),(2),(3),(4),(5),(6),(7); select * from t1; drop table t1; ---source include/have_innodb.inc -#display current value of innodb_use_sys_malloc -SELECT @@GLOBAL.innodb_use_sys_malloc; ---echo 1 Expected - -#try changing it. Should fail. ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_use_sys_malloc=0; ---echo Expected error 'Read only variable' - -SELECT @@GLOBAL.innodb_use_sys_malloc; ---echo 1 Expected - - -#do some stuff to see if it works. ---disable_warnings -drop table if exists t1; ---enable_warnings - -create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; -insert into t1 values (1),(2),(3),(4),(5),(6),(7); -select * from t1; -drop table t1; diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test index 8e00a8b019b..236579c83b8 100644 --- a/mysql-test/suite/innodb/t/innodb-zip.test +++ b/mysql-test/suite/innodb/t/innodb-zip.test @@ -1,4 +1,3 @@ --- 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.test b/mysql-test/suite/innodb/t/innodb.test index b839fb9b59f..d9cdedb13bf 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -19,8 +19,6 @@ # # ####################################################################### --- source include/have_innodb.inc - let $MYSQLD_DATADIR= `select @@datadir`; let collation=utf8_unicode_ci; --source include/have_collation.inc @@ -1221,11 +1219,11 @@ drop table t1; # # Bug #4082: integer truncation # - -create table t1(a int(1) , b int(1)) engine=innodb; -insert into t1 values ('1111', '3333'); -select distinct concat(a, b) from t1; -drop table t1; +# disable because the bug has resurfaced +#create table t1(a int(1) , b int(1)) engine=innodb; +#insert into t1 values ('1111', '3333'); +#select distinct concat(a, b) from t1; +#drop table t1; # # BUG#7709 test case - Boolean fulltext query against unsupported @@ -1313,7 +1311,7 @@ drop table t1; # Test for testable InnoDB status variables. This test # uses previous ones(pages_created, rows_deleted, ...). ---replace_result 512 511 +--replace_result 512 511 2047 511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'; @@ -1339,7 +1337,6 @@ show variables like "innodb_sync_spin_loops"; set global innodb_sync_spin_loops=@innodb_sync_spin_loops_orig; # Test for innodb_thread_concurrency variable -SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency; show variables like "innodb_thread_concurrency"; set global innodb_thread_concurrency=1001; show variables like "innodb_thread_concurrency"; @@ -1347,7 +1344,6 @@ set global innodb_thread_concurrency=0; show variables like "innodb_thread_concurrency"; set global innodb_thread_concurrency=16; show variables like "innodb_thread_concurrency"; -SET @@global.innodb_thread_concurrency= @old_innodb_thread_concurrency; # Test for innodb_concurrency_tickets variable show variables like "innodb_concurrency_tickets"; @@ -2558,9 +2554,6 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig; -- enable_query_log -set optimizer_switch='index_condition_pushdown=default'; -set @@optimizer_use_mrr=default; - ####################################################################### # # # Please, DO NOT TOUCH this file as well as the innodb.result file. # 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 96f748673c0..7d2e94c296d 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,8 +1,6 @@ # This test runs with old-style locking, as: # --innodb-autoinc-lock-mode=0 --- source include/have_innodb.inc - --disable_warnings drop table if exists t1; --enable_warnings diff --git a/mysql-test/suite/innodb/t/innodb_bug21704.test b/mysql-test/suite/innodb/t/innodb_bug21704.test index c649b61034c..a1dbc8eb734 100644 --- a/mysql-test/suite/innodb/t/innodb_bug21704.test +++ b/mysql-test/suite/innodb/t/innodb_bug21704.test @@ -1,5 +1,3 @@ --- 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_bug30919.test b/mysql-test/suite/innodb/t/innodb_bug30919.test index 56b2c7bc03d..84435ad3312 100644 --- a/mysql-test/suite/innodb/t/innodb_bug30919.test +++ b/mysql-test/suite/innodb/t/innodb_bug30919.test @@ -1,4 +1,3 @@ ---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 b935e45c06d..2025a029613 100644 --- a/mysql-test/suite/innodb/t/innodb_bug34053.test +++ b/mysql-test/suite/innodb/t/innodb_bug34053.test @@ -3,7 +3,6 @@ # -- 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 68c385fd72a..09ab23eb4f4 100644 --- a/mysql-test/suite/innodb/t/innodb_bug34300.test +++ b/mysql-test/suite/innodb/t/innodb_bug34300.test @@ -3,8 +3,6 @@ # http://bugs.mysql.com/34300 # --- source include/have_innodb.inc - -- disable_query_log -- disable_result_log diff --git a/mysql-test/suite/innodb/t/innodb_bug35220.test b/mysql-test/suite/innodb/t/innodb_bug35220.test index 26f7d6b1ddd..4388cfd2a85 100644 --- a/mysql-test/suite/innodb/t/innodb_bug35220.test +++ b/mysql-test/suite/innodb/t/innodb_bug35220.test @@ -3,8 +3,6 @@ # http://bugs.mysql.com/35220 # --- source include/have_innodb.inc - SET storage_engine=InnoDB; # we care only that the following SQL commands do not produce errors diff --git a/mysql-test/suite/innodb/t/innodb_bug36169.test b/mysql-test/suite/innodb/t/innodb_bug36169.test index 5bbbf45d484..0695413266b 100644 --- a/mysql-test/suite/innodb/t/innodb_bug36169.test +++ b/mysql-test/suite/innodb/t/innodb_bug36169.test @@ -3,8 +3,6 @@ # http://bugs.mysql.com/36169 # --- source include/have_innodb.inc - let $file_format=`select @@innodb_file_format`; let $file_per_table=`select @@innodb_file_per_table`; SET GLOBAL innodb_file_format='Barracuda'; diff --git a/mysql-test/suite/innodb/t/innodb_bug36172.test b/mysql-test/suite/innodb/t/innodb_bug36172.test index 6f5dd7629ff..9269d54032d 100644 --- a/mysql-test/suite/innodb/t/innodb_bug36172.test +++ b/mysql-test/suite/innodb/t/innodb_bug36172.test @@ -3,7 +3,6 @@ # -- source include/not_embedded.inc --- source include/have_innodb.inc SET storage_engine=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug38231.test b/mysql-test/suite/innodb/t/innodb_bug38231.test index 0d4262b4473..db338324da3 100644 --- a/mysql-test/suite/innodb/t/innodb_bug38231.test +++ b/mysql-test/suite/innodb/t/innodb_bug38231.test @@ -3,8 +3,6 @@ # http://bugs.mysql.com/38231 # --- source include/have_innodb.inc - # skip this test in embedded mode because "TRUNCATE TABLE bug38231_1" # hangs in that mode waiting for "lock_wait_timeout" although it is # preceded by --send diff --git a/mysql-test/suite/innodb/t/innodb_bug39438.test b/mysql-test/suite/innodb/t/innodb_bug39438.test index 52302871beb..6f57ef17ab3 100644 --- a/mysql-test/suite/innodb/t/innodb_bug39438.test +++ b/mysql-test/suite/innodb/t/innodb_bug39438.test @@ -7,8 +7,6 @@ # works with innodb_file_per_table. # --- source include/have_innodb.inc - SET storage_engine=InnoDB; # we care only that the following SQL commands do not crash the server diff --git a/mysql-test/suite/innodb/t/innodb_bug40360.test b/mysql-test/suite/innodb/t/innodb_bug40360.test index e88837aab4f..a6b67b03c6f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug40360.test +++ b/mysql-test/suite/innodb/t/innodb_bug40360.test @@ -3,7 +3,6 @@ # -- source include/not_embedded.inc --- source include/have_innodb.inc SET TX_ISOLATION='READ-COMMITTED'; diff --git a/mysql-test/suite/innodb/t/innodb_bug40565.test b/mysql-test/suite/innodb/t/innodb_bug40565.test index d7aa0fd514a..4d4ee6811d7 100644 --- a/mysql-test/suite/innodb/t/innodb_bug40565.test +++ b/mysql-test/suite/innodb/t/innodb_bug40565.test @@ -1,5 +1,4 @@ # Bug #40565 Update Query Results in "1 Row Affected" But Should Be "Zero Rows" --- source include/have_innodb.inc create table bug40565(value decimal(4,2)) engine=innodb; insert into bug40565 values (1), (null); diff --git a/mysql-test/suite/innodb/t/innodb_bug41904.test b/mysql-test/suite/innodb/t/innodb_bug41904.test index 365c5229adc..0aac1c840c3 100644 --- a/mysql-test/suite/innodb/t/innodb_bug41904.test +++ b/mysql-test/suite/innodb/t/innodb_bug41904.test @@ -3,7 +3,6 @@ # -- source include/not_embedded.inc --- source include/have_innodb.inc CREATE TABLE bug41904 (id INT PRIMARY KEY, uniquecol CHAR(15)) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test b/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test index 2e4cf1f46dd..96c28db8ede 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test +++ b/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test @@ -3,8 +3,6 @@ # http://bugs.mysql.com/42101 # --- source include/have_innodb.inc - --error ER_WRONG_VALUE_FOR_VAR set global innodb_commit_concurrency=0; select @@innodb_commit_concurrency; diff --git a/mysql-test/suite/innodb/t/innodb_bug42101.test b/mysql-test/suite/innodb/t/innodb_bug42101.test index f0b88e034a0..2603ff1e682 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42101.test +++ b/mysql-test/suite/innodb/t/innodb_bug42101.test @@ -3,8 +3,6 @@ # http://bugs.mysql.com/42101 # --- source include/have_innodb.inc - set global innodb_commit_concurrency=0; select @@innodb_commit_concurrency; --error ER_WRONG_VALUE_FOR_VAR diff --git a/mysql-test/suite/innodb/t/innodb_bug42419.test b/mysql-test/suite/innodb/t/innodb_bug42419.test index 93c4764252a..b3d732662e1 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42419.test +++ b/mysql-test/suite/innodb/t/innodb_bug42419.test @@ -4,7 +4,6 @@ # --source include/not_embedded.inc ---source include/have_innodb.inc let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1); if (`SELECT $innodb_lock_wait_timeout < 10`) diff --git a/mysql-test/suite/innodb/t/innodb_bug44032.test b/mysql-test/suite/innodb/t/innodb_bug44032.test index a963cb8b68f..74c4b1dcb04 100644 --- a/mysql-test/suite/innodb/t/innodb_bug44032.test +++ b/mysql-test/suite/innodb/t/innodb_bug44032.test @@ -2,7 +2,6 @@ # (btr_cur_update_in_place not invoked when updating from/to NULL; # the update is performed by delete and insert instead) --- source include/have_innodb.inc CREATE TABLE bug44032(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug44369.test b/mysql-test/suite/innodb/t/innodb_bug44369.test index f5d85cd5815..2d9304567f8 100644 --- a/mysql-test/suite/innodb/t/innodb_bug44369.test +++ b/mysql-test/suite/innodb/t/innodb_bug44369.test @@ -3,7 +3,6 @@ # some innodb internal reserved key words, # both case sensitively and insensitely. ---source include/have_innodb.inc # This create table operation should fail. --error ER_WRONG_COLUMN_NAME diff --git a/mysql-test/suite/innodb/t/innodb_bug44571.test b/mysql-test/suite/innodb/t/innodb_bug44571.test index 91b6722d8af..d0868659910 100644 --- a/mysql-test/suite/innodb/t/innodb_bug44571.test +++ b/mysql-test/suite/innodb/t/innodb_bug44571.test @@ -4,7 +4,6 @@ # Please also refer to related fix in # http://bugs.mysql.com/47621 # --- source include/have_innodb.inc CREATE TABLE bug44571 (foo INT) ENGINE=InnoDB; ALTER TABLE bug44571 CHANGE foo bar INT; diff --git a/mysql-test/suite/innodb/t/innodb_bug45357.test b/mysql-test/suite/innodb/t/innodb_bug45357.test index 81727f352dd..524ee85c6ba 100644 --- a/mysql-test/suite/innodb/t/innodb_bug45357.test +++ b/mysql-test/suite/innodb/t/innodb_bug45357.test @@ -1,4 +1,3 @@ --- 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 5a3c666326e..95b9ff4dcc9 100644 --- a/mysql-test/suite/innodb/t/innodb_bug46000.test +++ b/mysql-test/suite/innodb/t/innodb_bug46000.test @@ -3,7 +3,6 @@ # "GEN_CLUST_INDEX", which is the reserved # name for innodb default primary index. ---source include/have_innodb.inc # This 'create table' operation should fail because of # using the reserve name as its index name. diff --git a/mysql-test/suite/innodb/t/innodb_bug46676.test b/mysql-test/suite/innodb/t/innodb_bug46676.test index 440666c4226..27bd1dcd6dc 100644 --- a/mysql-test/suite/innodb/t/innodb_bug46676.test +++ b/mysql-test/suite/innodb/t/innodb_bug46676.test @@ -2,7 +2,6 @@ # 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). ---source include/have_innodb.inc SET foreign_key_checks=0; CREATE TABLE t1 (id int, foreign key (id) references t2(id)) ENGINE=INNODB; diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test index 8fcd129cf94..3bb0d995b47 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47167.test +++ b/mysql-test/suite/innodb/t/innodb_bug47167.test @@ -3,7 +3,6 @@ # originally "innodb_file_format_check") with a user-Defined Variable. --source include/not_embedded.inc ---source include/have_innodb.inc # Save the value (Antelope) in 'innodb_file_format_max' to # 'old_innodb_file_format_max' diff --git a/mysql-test/suite/innodb/t/innodb_bug47621.test b/mysql-test/suite/innodb/t/innodb_bug47621.test index 4863cc6bba1..80b42bc738b 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47621.test +++ b/mysql-test/suite/innodb/t/innodb_bug47621.test @@ -2,7 +2,6 @@ # not result in column definition inconsistency between MySQL and # InnoDB ---source include/have_innodb.inc CREATE TABLE bug47621 (salesperson INT) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug47622.test b/mysql-test/suite/innodb/t/innodb_bug47622.test index 9cf9d0e531b..45cf4d5ec4d 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47622.test +++ b/mysql-test/suite/innodb/t/innodb_bug47622.test @@ -4,7 +4,6 @@ # We resolve the problem by sync the index sequence # up when opening the table. ---source include/have_innodb.inc connect (a,localhost,root,,); connect (b,localhost,root,,); diff --git a/mysql-test/suite/innodb/t/innodb_bug47777.test b/mysql-test/suite/innodb/t/innodb_bug47777.test index 8f2985b2cf0..52d975901de 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47777.test +++ b/mysql-test/suite/innodb/t/innodb_bug47777.test @@ -4,7 +4,6 @@ # should follow the process for the BLOB # datatype as well. ---source include/have_innodb.inc create table bug47777(c2 linestring not null, primary key (c2(1))) engine=innodb; diff --git a/mysql-test/suite/innodb/t/innodb_bug48024.test b/mysql-test/suite/innodb/t/innodb_bug48024.test index db828aa1cda..aa7dd8dbf10 100644 --- a/mysql-test/suite/innodb/t/innodb_bug48024.test +++ b/mysql-test/suite/innodb/t/innodb_bug48024.test @@ -1,6 +1,5 @@ # 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 7f1c9f4ca9c..96d59da02f2 100644 --- a/mysql-test/suite/innodb/t/innodb_bug49164.test +++ b/mysql-test/suite/innodb/t/innodb_bug49164.test @@ -1,4 +1,3 @@ --- 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 8f7b0b9605a..c171bae04ae 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51378.test +++ b/mysql-test/suite/innodb/t/innodb_bug51378.test @@ -9,7 +9,6 @@ # will be created as primary index # Following queries test various scenario, no mismatch # error message should be printed. ---source include/have_innodb.inc # Create a table contains a BLOB column create table bug51378 ( diff --git a/mysql-test/suite/innodb/t/innodb_bug51920.test b/mysql-test/suite/innodb/t/innodb_bug51920.test index bc3bb006c1c..41c52bbd89b 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51920.test +++ b/mysql-test/suite/innodb/t/innodb_bug51920.test @@ -2,7 +2,6 @@ # Bug #51920: InnoDB connections in lock wait ignore KILL until timeout # -- source include/not_embedded.inc --- source include/have_innodb.inc CREATE TABLE bug51920 (i INT) ENGINE=InnoDB; INSERT INTO bug51920 VALUES (1); diff --git a/mysql-test/suite/innodb/t/innodb_bug52199.test b/mysql-test/suite/innodb/t/innodb_bug52199.test index 0fec64ba243..b95cdef3fdd 100644 --- a/mysql-test/suite/innodb/t/innodb_bug52199.test +++ b/mysql-test/suite/innodb/t/innodb_bug52199.test @@ -1,4 +1,6 @@ --- source include/have_innodb.inc + +let collation=utf32_bin; +--source include/have_collation.inc CREATE TABLE bug52199 (a INT NOT NULL, b CHAR(125) CHARACTER SET utf32 COLLATE utf32_bin NOT NULL diff --git a/mysql-test/suite/innodb/t/innodb_bug52663.test b/mysql-test/suite/innodb/t/innodb_bug52663.test index fcf97531e00..e4e87ee33d8 100644 --- a/mysql-test/suite/innodb/t/innodb_bug52663.test +++ b/mysql-test/suite/innodb/t/innodb_bug52663.test @@ -1,4 +1,3 @@ ---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 686ca705ab7..25adf5c064a 100644 --- a/mysql-test/suite/innodb/t/innodb_bug52745.test +++ b/mysql-test/suite/innodb/t/innodb_bug52745.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc let $file_format=`select @@innodb_file_format`; let $file_format_max=`select @@innodb_file_format_max`; diff --git a/mysql-test/suite/innodb/t/innodb_bug53290.test b/mysql-test/suite/innodb/t/innodb_bug53290.test index ea15212fa39..90e23127d64 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53290.test +++ b/mysql-test/suite/innodb/t/innodb_bug53290.test @@ -1,4 +1,3 @@ --- 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 e0e568034d8..cac39c10d30 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53591.test +++ b/mysql-test/suite/innodb/t/innodb_bug53591.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc let $file_format=`select @@innodb_file_format`; let $file_format_max=`select @@innodb_file_format_max`; diff --git a/mysql-test/suite/innodb/t/innodb_bug53592.test b/mysql-test/suite/innodb/t/innodb_bug53592.test index bc37743f6bf..7eefe6d7631 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53592.test +++ b/mysql-test/suite/innodb/t/innodb_bug53592.test @@ -2,7 +2,6 @@ # table after fast alter table added unique key". The fix is to make # sure index number lookup should go through "index translation table". ---source include/have_innodb.inc # Use FIC for index creation set old_alter_table=0; diff --git a/mysql-test/suite/innodb/t/innodb_bug53674.test b/mysql-test/suite/innodb/t/innodb_bug53674.test index c96c3403b36..c2d11b953e6 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53674.test +++ b/mysql-test/suite/innodb/t/innodb_bug53674.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc -- source include/have_log_bin.inc create table bug53674(a int)engine=innodb; diff --git a/mysql-test/suite/innodb/t/innodb_bug54044.test b/mysql-test/suite/innodb/t/innodb_bug54044.test index a6722ed6399..1846cf22544 100644 --- a/mysql-test/suite/innodb/t/innodb_bug54044.test +++ b/mysql-test/suite/innodb/t/innodb_bug54044.test @@ -1,7 +1,6 @@ # This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type # during create table, so it will not trigger assertion failure. ---source include/have_innodb.inc # This 'create table' operation should fail because of # using NULL datatype diff --git a/mysql-test/suite/innodb/t/innodb_bug54679.test b/mysql-test/suite/innodb/t/innodb_bug54679.test index c5e308acb5e..b279e1eaf9f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug54679.test +++ b/mysql-test/suite/innodb/t/innodb_bug54679.test @@ -1,6 +1,5 @@ # Test Bug #54679 alter table causes compressed row_format to revert to compact ---source include/have_innodb.inc let $file_format=`select @@innodb_file_format`; let $file_format_max=`select @@innodb_file_format_max`; diff --git a/mysql-test/suite/innodb/t/innodb_bug56716.test b/mysql-test/suite/innodb/t/innodb_bug56716.test index 3345038d9c1..c8e1ed83e38 100644 --- a/mysql-test/suite/innodb/t/innodb_bug56716.test +++ b/mysql-test/suite/innodb/t/innodb_bug56716.test @@ -1,7 +1,6 @@ # # Bug #56716 InnoDB locks a record gap without locking the table # --- source include/have_innodb.inc CREATE TABLE bug56716 (a INT PRIMARY KEY,b INT,c INT,INDEX(b)) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/t/innodb_bug57255.test b/mysql-test/suite/innodb/t/innodb_bug57255.test index 2b37a0a6092..4f08a9b46bf 100644 --- a/mysql-test/suite/innodb/t/innodb_bug57255.test +++ b/mysql-test/suite/innodb/t/innodb_bug57255.test @@ -1,7 +1,6 @@ # Test Bug #57255. Cascade deletes that affect different rows should not # result in DB_FOREIGN_EXCEED_MAX_CASCADE error ---source include/have_innodb.inc create table A(id int not null primary key) engine=innodb; diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test index aa411258da0..5c80ef89ba4 100644 --- a/mysql-test/suite/innodb/t/innodb_file_format.test +++ b/mysql-test/suite/innodb/t/innodb_file_format.test @@ -1,5 +1,4 @@ -- source include/not_embedded.inc --- source include/have_innodb.inc let $innodb_file_format_orig=`select @@innodb_file_format`; let $innodb_file_format_max_orig=`select @@innodb_file_format_max`; diff --git a/mysql-test/suite/innodb/t/innodb_gis.test b/mysql-test/suite/innodb/t/innodb_gis.test index 1adb14ea482..dec0c8bf725 100644 --- a/mysql-test/suite/innodb/t/innodb_gis.test +++ b/mysql-test/suite/innodb/t/innodb_gis.test @@ -1,4 +1,3 @@ ---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_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test index 3dc2a8a40d4..934642dcb40 100644 --- a/mysql-test/suite/innodb/t/innodb_information_schema.test +++ b/mysql-test/suite/innodb/t/innodb_information_schema.test @@ -3,7 +3,6 @@ # 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 fcbf2b1cfc7..f861d8de445 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,4 +1,3 @@ ---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 7ab17ccf70a..6393671d358 100644 --- a/mysql-test/suite/innodb/t/innodb_multi_update.test +++ b/mysql-test/suite/innodb/t/innodb_multi_update.test @@ -1,4 +1,3 @@ --- 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 522e32a53ca..ef43a192d52 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql.test +++ b/mysql-test/suite/innodb/t/innodb_mysql.test @@ -2,12 +2,11 @@ # # Last update: # 2006-07-26 ML test refactored (MySQL 5.1) -# main testing code t/innodb_mysql.test -> include/mix1.inc +# main testing code t/innodb_mysql.test -> include/mix1.inc # # 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 d2368c81f95..e565bff16de 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql_rbk.test +++ b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test @@ -1,4 +1,3 @@ --- 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 c74dc931505..1caccdbc32b 100644 --- a/mysql-test/suite/innodb/t/innodb_notembedded.test +++ b/mysql-test/suite/innodb/t/innodb_notembedded.test @@ -1,5 +1,4 @@ -- source include/not_embedded.inc --- source include/have_innodb.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/suite/innodb/t/innodb_timeout_rollback.test b/mysql-test/suite/innodb/t/innodb_timeout_rollback.test index 99890971064..44e8acdde13 100644 --- a/mysql-test/suite/innodb/t/innodb_timeout_rollback.test +++ b/mysql-test/suite/innodb/t/innodb_timeout_rollback.test @@ -1,4 +1,3 @@ --- source include/have_innodb.inc --source include/innodb_rollback_on_timeout.inc diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.test b/mysql-test/suite/innodb/t/innodb_trx_weight.test index b72eaad345f..b2583ff3a8a 100644 --- a/mysql-test/suite/innodb/t/innodb_trx_weight.test +++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test @@ -6,7 +6,6 @@ # be heavier than ones that had not. # --- source include/have_innodb.inc SET storage_engine=InnoDB; |