diff options
Diffstat (limited to 'mysql-test/suite/innodb')
19 files changed, 45 insertions, 177 deletions
diff --git a/mysql-test/suite/innodb/include/have_innodb_plugin.inc b/mysql-test/suite/innodb/include/have_innodb_plugin.inc deleted file mode 100644 index 24af3274ada..00000000000 --- a/mysql-test/suite/innodb/include/have_innodb_plugin.inc +++ /dev/null @@ -1,4 +0,0 @@ -disable_query_log; ---require r/true.require -select (PLUGIN_LIBRARY LIKE 'ha_innodb_plugin%') as `TRUE` from information_schema.plugins where PLUGIN_NAME='InnoDB'; -enable_query_log; diff --git a/mysql-test/suite/innodb/r/innodb-consistent.result b/mysql-test/suite/innodb/r/innodb-consistent.result deleted file mode 100644 index 9115791b99c..00000000000 --- a/mysql-test/suite/innodb/r/innodb-consistent.result +++ /dev/null @@ -1,35 +0,0 @@ -drop table if exists t1; -set session transaction isolation level read committed; -create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; -create table t2 like t1; -insert into t2 values (1),(2),(3),(4),(5),(6),(7); -set autocommit=0; -begin; -replace into t1 select * from t2; -set session transaction isolation level read committed; -set autocommit=0; -delete from t2 where a=5; -commit; -delete from t2; -commit; -commit; -begin; -insert into t1 select * from t2; -set session transaction isolation level read committed; -set autocommit=0; -delete from t2 where a=5; -commit; -delete from t2; -commit; -commit; -select * from t1; -a -1 -2 -3 -4 -5 -6 -7 -drop table t1; -drop table t2; diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb/r/innodb-zip.result index 21396d81ba8..bcd3849238f 100644 --- a/mysql-test/suite/innodb/r/innodb-zip.result +++ b/mysql-test/suite/innodb/r/innodb-zip.result @@ -173,19 +173,19 @@ select @@innodb_file_format; @@innodb_file_format Barracuda set global innodb_file_format=`2`; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '2' set global innodb_file_format=`-1`; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '-1' set global innodb_file_format=`Antelope`; set global innodb_file_format=`Barracuda`; set global innodb_file_format=`Cheetah`; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Cheetah' set global innodb_file_format=`abc`; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'abc' set global innodb_file_format=`1a`; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '1a' set global innodb_file_format=``; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '' set global innodb_file_per_table = on; set global innodb_file_format = `1`; set innodb_strict_mode = off; diff --git a/mysql-test/suite/innodb/r/innodb_bug44571.result b/mysql-test/suite/innodb/r/innodb_bug44571.result deleted file mode 100644 index 36374edcb3e..00000000000 --- a/mysql-test/suite/innodb/r/innodb_bug44571.result +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE bug44571 (foo INT) ENGINE=InnoDB; -ALTER TABLE bug44571 CHANGE foo bar INT; -ALTER TABLE bug44571 ADD INDEX bug44571b (foo); -ERROR 42000: Key column 'foo' doesn't exist in table -ALTER TABLE bug44571 ADD INDEX bug44571b (bar); -ERROR HY000: Incorrect key file for table 'bug44571'; try to repair it -CREATE INDEX bug44571b ON bug44571 (bar); -ERROR HY000: Incorrect key file for table 'bug44571'; try to repair it -DROP TABLE bug44571; diff --git a/mysql-test/suite/innodb/r/innodb_bug47167.result b/mysql-test/suite/innodb/r/innodb_bug47167.result index cbec363d78f..cf8cb0c0d7b 100644 --- a/mysql-test/suite/innodb/r/innodb_bug47167.result +++ b/mysql-test/suite/innodb/r/innodb_bug47167.result @@ -15,10 +15,10 @@ select @@innodb_file_format_check; @@innodb_file_format_check Antelope set global innodb_file_format_check = cheetah; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'cheetah' set global innodb_file_format_check = Bear; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'Bear' set global innodb_file_format_check = on; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'ON' set global innodb_file_format_check = off; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'off' diff --git a/mysql-test/suite/innodb/r/innodb_file_format.result b/mysql-test/suite/innodb/r/innodb_file_format.result index 36f176c616a..107025e4e52 100644 --- a/mysql-test/suite/innodb/r/innodb_file_format.result +++ b/mysql-test/suite/innodb/r/innodb_file_format.result @@ -8,7 +8,7 @@ Antelope set global innodb_file_format=antelope; set global innodb_file_format=barracuda; set global innodb_file_format=cheetah; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'cheetah' select @@innodb_file_format; @@innodb_file_format Barracuda @@ -17,16 +17,16 @@ select @@innodb_file_format; @@innodb_file_format Antelope set global innodb_file_format=on; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON' set global innodb_file_format=off; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off' select @@innodb_file_format; @@innodb_file_format Antelope set global innodb_file_format_check=antelope; set global innodb_file_format_check=barracuda; set global innodb_file_format_check=cheetah; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'cheetah' select @@innodb_file_format_check; @@innodb_file_format_check Barracuda @@ -35,9 +35,9 @@ select @@innodb_file_format_check; @@innodb_file_format_check Barracuda set global innodb_file_format=on; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON' set global innodb_file_format=off; -ERROR HY000: Incorrect arguments to SET +ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off' select @@innodb_file_format_check; @@innodb_file_format_check Barracuda diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def index baf8c89f539..6535ee27887 100644 --- a/mysql-test/suite/innodb/t/disabled.def +++ b/mysql-test/suite/innodb/t/disabled.def @@ -1 +1 @@ -innodb-index: InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal +innodb-index : Bug#49396 2009-12-03 test fails in embedded mode diff --git a/mysql-test/suite/innodb/t/innodb-analyze.test b/mysql-test/suite/innodb/t/innodb-analyze.test index 870e6434797..9bdb9db697c 100644 --- a/mysql-test/suite/innodb/t/innodb-analyze.test +++ b/mysql-test/suite/innodb/t/innodb-analyze.test @@ -4,7 +4,6 @@ # -- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc # we care only that the following SQL commands do not produce errors # and do not crash the server @@ -12,6 +11,7 @@ -- disable_result_log -- enable_warnings +let $sample_pages=`select @@innodb_stats_sample_pages`; SET GLOBAL innodb_stats_sample_pages=0; # check that the value has been adjusted to 1 @@ -62,5 +62,4 @@ SET GLOBAL innodb_stats_sample_pages=16; ANALYZE TABLE innodb_analyze; DROP TABLE innodb_analyze; - -SET GLOBAL innodb_stats_sample_pages=DEFAULT; +EVAL SET GLOBAL innodb_stats_sample_pages=$sample_pages; diff --git a/mysql-test/suite/innodb/t/innodb-consistent-master.opt b/mysql-test/suite/innodb/t/innodb-consistent-master.opt deleted file mode 100644 index cb48f1aaf60..00000000000 --- a/mysql-test/suite/innodb/t/innodb-consistent-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb_lock_wait_timeout=2 diff --git a/mysql-test/suite/innodb/t/innodb-consistent.test b/mysql-test/suite/innodb/t/innodb-consistent.test deleted file mode 100644 index b58d0cb0e62..00000000000 --- a/mysql-test/suite/innodb/t/innodb-consistent.test +++ /dev/null @@ -1,59 +0,0 @@ --- source include/not_embedded.inc --- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc - ---disable_warnings -drop table if exists t1; ---enable_warnings - -# REPLACE INTO ... SELECT and INSERT INTO ... SELECT should do -# a consistent read of the source table. - -connect (a,localhost,root,,); -connect (b,localhost,root,,); -connection a; -set session transaction isolation level read committed; -create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; -create table t2 like t1; -insert into t2 values (1),(2),(3),(4),(5),(6),(7); -set autocommit=0; - -# REPLACE INTO ... SELECT case -begin; -# this should not result in any locks on t2. -replace into t1 select * from t2; - -connection b; -set session transaction isolation level read committed; -set autocommit=0; -# should not cuase a lock wait. -delete from t2 where a=5; -commit; -delete from t2; -commit; -connection a; -commit; - -# INSERT INTO ... SELECT case -begin; -# this should not result in any locks on t2. -insert into t1 select * from t2; - -connection b; -set session transaction isolation level read committed; -set autocommit=0; -# should not cuase a lock wait. -delete from t2 where a=5; -commit; -delete from t2; -commit; -connection a; -commit; - -select * from t1; -drop table t1; -drop table t2; - -connection default; -disconnect a; -disconnect b; diff --git a/mysql-test/suite/innodb/t/innodb-timeout.test b/mysql-test/suite/innodb/t/innodb-timeout.test index 1ee1ad63180..f23fe3cff2d 100644 --- a/mysql-test/suite/innodb/t/innodb-timeout.test +++ b/mysql-test/suite/innodb/t/innodb-timeout.test @@ -1,5 +1,4 @@ -- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc let $timeout=`select @@innodb_lock_wait_timeout`; set global innodb_lock_wait_timeout=42; 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 4df3ca9d27c..325dd19d086 100644 --- a/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test +++ b/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc #display current value of innodb_use_sys_malloc SELECT @@GLOBAL.innodb_use_sys_malloc; diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test index c27392ac4fa..eb517563416 100644 --- a/mysql-test/suite/innodb/t/innodb-zip.test +++ b/mysql-test/suite/innodb/t/innodb-zip.test @@ -1,5 +1,4 @@ -- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc let $per_table=`select @@innodb_file_per_table`; let $format=`select @@innodb_file_format`; @@ -143,19 +142,19 @@ set global innodb_file_format=`0`; select @@innodb_file_format; set global innodb_file_format=`1`; select @@innodb_file_format; --- error ER_WRONG_ARGUMENTS +-- error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=`2`; --- error ER_WRONG_ARGUMENTS +-- error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=`-1`; set global innodb_file_format=`Antelope`; set global innodb_file_format=`Barracuda`; --- error ER_WRONG_ARGUMENTS +-- error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=`Cheetah`; --- error ER_WRONG_ARGUMENTS +-- error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=`abc`; --- error ER_WRONG_ARGUMENTS +-- error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=`1a`; --- error ER_WRONG_ARGUMENTS +-- error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=``; #test strict mode. diff --git a/mysql-test/suite/innodb/t/innodb_bug36169.test b/mysql-test/suite/innodb/t/innodb_bug36169.test index da852b816f4..5bf55193b5c 100644 --- a/mysql-test/suite/innodb/t/innodb_bug36169.test +++ b/mysql-test/suite/innodb/t/innodb_bug36169.test @@ -4,8 +4,9 @@ # -- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc +let $file_format=`select @@innodb_file_format`; +let $file_per_table=`select @@innodb_file_per_table`; SET GLOBAL innodb_file_format='Barracuda'; SET GLOBAL innodb_file_per_table=ON; @@ -1154,6 +1155,5 @@ DROP TABLE IF EXISTS table4; DROP TABLE IF EXISTS table5; DROP TABLE IF EXISTS table6; -SET GLOBAL innodb_file_per_table=DEFAULT; -SET GLOBAL innodb_file_format='Antelope'; -SET GLOBAL innodb_file_format_check='Antelope'; +EVAL SET GLOBAL innodb_file_format=$file_format; +EVAL SET GLOBAL innodb_file_per_table=$file_per_table; diff --git a/mysql-test/suite/innodb/t/innodb_bug36172.test b/mysql-test/suite/innodb/t/innodb_bug36172.test index 9e1308d5fc3..c6c4e6fae47 100644 --- a/mysql-test/suite/innodb/t/innodb_bug36172.test +++ b/mysql-test/suite/innodb/t/innodb_bug36172.test @@ -4,7 +4,6 @@ -- source include/not_embedded.inc -- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc SET storage_engine=InnoDB; @@ -15,6 +14,9 @@ SET storage_engine=InnoDB; -- disable_query_log -- disable_result_log +let $file_format=`select @@innodb_file_format`; +let $file_format_check=`select @@innodb_file_format_check`; +let $file_per_table=`select @@innodb_file_per_table`; SET GLOBAL innodb_file_format='Barracuda'; SET GLOBAL innodb_file_per_table=on; @@ -25,7 +27,6 @@ CHECK TABLE table0 EXTENDED; INSERT IGNORE INTO `table0` SET `col19` = '19940127002709', `col20` = 2383927.9055146948, `col21` = 4293243420.5621204000, `col22` = '20511211123705', `col23` = 4289899778.6573381000, `col24` = 4293449279.0540481000, `col25` = 'emphysemic', `col26` = 'dentally', `col27` = '2347406', `col28` = 'eruct', `col30` = 1222, `col31` = 4294372994.9941406000, `col32` = 4291385574.1173744000, `col33` = 'borrowing\'s', `col34` = 'septics', `col35` = 'ratter\'s', `col36` = 'Kaye', `col37` = 'Florentia', `col38` = 'allium', `col39` = 'barkeep', `col40` = '19510407003441', `col41` = 4293559200.4215522000, `col42` = 22482, `col43` = 'decussate', `col44` = 'Brom\'s', `col45` = 'violated', `col46` = 4925506.4635456400, `col47` = 930549, `col48` = '51296066', `col49` = 'voluminously', `col50` = '29306676', `col51` = -88, `col52` = -2153690, `col53` = 4290250202.1464887000, `col54` = 'expropriation', `col55` = 'Aberdeen\'s', `col56` = 20343, `col58` = '19640415171532', `col59` = 'extern', `col60` = 'Ubana', `col61` = 4290487961.8539081000, `col62` = '2147', `col63` = -24271, `col64` = '20750801194548', `col65` = 'Cunaxa\'s', `col66` = 'pasticcio', `col67` = 2795817, `col68` = 'Indore\'s', `col70` = 6864127, `col71` = '1817832', `col72` = '20540506114211', `col73` = '20040101012300', `col74` = 'rationalized', `col75` = '45522', `col76` = 'indene', `col77` = -6964559, `col78` = 4247535.5266884370, `col79` = '20720416124357', `col80` = '2143', `col81` = 4292060102.4466386000, `col82` = 'striving', `col83` = 'boneblack\'s', `col84` = 'redolent', `col85` = 6489697.9009369183, `col86` = 4287473465.9731131000, `col87` = 7726015, `col88` = 'perplexed', `col89` = '17153791', `col90` = 5478587.1108127078, `col91` = 4287091404.7004304000, `col92` = 'Boulez\'s', `col93` = '2931278'; CHECK TABLE table0 EXTENDED; DROP TABLE table0; - -SET GLOBAL innodb_file_per_table=DEFAULT; -SET GLOBAL innodb_file_format='Antelope'; -SET GLOBAL innodb_file_format_check='Antelope'; +EVAL SET GLOBAL innodb_file_format=$file_format; +EVAL SET GLOBAL innodb_file_format_check=$file_format_check; +EVAL SET GLOBAL innodb_file_per_table=$file_per_table; diff --git a/mysql-test/suite/innodb/t/innodb_bug44571.test b/mysql-test/suite/innodb/t/innodb_bug44571.test deleted file mode 100644 index 43f290cde84..00000000000 --- a/mysql-test/suite/innodb/t/innodb_bug44571.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# Bug#44571 InnoDB Plugin crashes on ADD INDEX -# http://bugs.mysql.com/44571 -# --- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc - -CREATE TABLE bug44571 (foo INT) ENGINE=InnoDB; -ALTER TABLE bug44571 CHANGE foo bar INT; --- error ER_KEY_COLUMN_DOES_NOT_EXITS -ALTER TABLE bug44571 ADD INDEX bug44571b (foo); -# The following will fail, because the CHANGE foo bar was -# not communicated to InnoDB. ---error ER_NOT_KEYFILE -ALTER TABLE bug44571 ADD INDEX bug44571b (bar); ---error ER_NOT_KEYFILE -CREATE INDEX bug44571b ON bug44571 (bar); -DROP TABLE bug44571; diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test index df056b91ff9..9b8bff0292f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47167.test +++ b/mysql-test/suite/innodb/t/innodb_bug47167.test @@ -4,7 +4,6 @@ # user-Defined Variable. --source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc # Save the value (Antelope) in 'innodb_file_format_check' to # 'old_innodb_file_format_check' @@ -32,15 +31,15 @@ select @@innodb_file_format_check; # Following are negative tests, all should fail. --disable_warnings ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_check = cheetah; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_check = Bear; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_check = on; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_check = off; --enable_warnings diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test index 4823254b959..4e11da5f123 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/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc call mtr.add_suppression("InnoDB: invalid innodb_file_format_check value"); @@ -10,26 +9,26 @@ select @@innodb_file_format; select @@innodb_file_format_check; set global innodb_file_format=antelope; set global innodb_file_format=barracuda; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=cheetah; select @@innodb_file_format; set global innodb_file_format=default; select @@innodb_file_format; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=on; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=off; select @@innodb_file_format; set global innodb_file_format_check=antelope; set global innodb_file_format_check=barracuda; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_check=cheetah; select @@innodb_file_format_check; set global innodb_file_format_check=default; select @@innodb_file_format_check; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=on; ---error ER_WRONG_ARGUMENTS +--error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format=off; select @@innodb_file_format_check; diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test index 599215e9ca4..fc1d38d8d14 100644 --- a/mysql-test/suite/innodb/t/innodb_information_schema.test +++ b/mysql-test/suite/innodb/t/innodb_information_schema.test @@ -4,7 +4,6 @@ # -- source include/have_innodb.inc --- source suite/innodb/include/have_innodb_plugin.inc -- disable_query_log -- disable_result_log |