From 097e65625a0a6748ebb11225382ff69bbc35140e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Jul 2013 15:43:43 +0300 Subject: [PATCH] MDEV-4548 [PATCH] Limit the amount of side-checking done in innodb-zip test --- mysql-test/suite/innodb/r/innodb-zip.result | 205 +++++++++----------- mysql-test/suite/innodb/t/innodb-zip.test | 37 ++-- 2 files changed, 121 insertions(+), 121 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb/r/innodb-zip.result index 3f0c8b43f0c..69e463a4390 100644 --- a/mysql-test/suite/innodb/r/innodb-zip.result +++ b/mysql-test/suite/innodb/r/innodb-zip.result @@ -1,3 +1,10 @@ +DROP DATABASE IF EXISTS mysqltest_innodb_zip; +CREATE DATABASE mysqltest_innodb_zip; +USE mysqltest_innodb_zip; +SELECT table_name, row_format, data_length, index_length +FROM information_schema.tables +WHERE table_schema='mysqltest_innodb_zip'; +table_name row_format data_length index_length set session innodb_strict_mode=0; set global innodb_file_per_table=off; set global innodb_file_format=`0`; @@ -64,49 +71,41 @@ create table t14(a int primary key) engine=innodb key_block_size=9; Warnings: Warning 140 InnoDB: ignoring KEY_BLOCK_SIZE=9. SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t0 Compact 16384 0 -test t00 Compact 16384 0 -test t1 Compact 16384 0 -test t10 Dynamic 16384 0 -test t11 Compressed 1024 0 -test t12 Compressed 1024 0 -test t13 Compressed 8192 0 -test t14 Compact 16384 0 -test t2 Redundant 16384 0 -test t3 Compact 16384 0 -test t4 Compact 16384 0 -test t5 Redundant 16384 0 -test t6 Redundant 16384 0 -test t7 Redundant 16384 0 -test t8 Compact 16384 0 -test t9 Compact 16384 0 +mysqltest_innodb_zip t0 Compact 16384 0 +mysqltest_innodb_zip t00 Compact 16384 0 +mysqltest_innodb_zip t1 Compact 16384 0 +mysqltest_innodb_zip t10 Dynamic 16384 0 +mysqltest_innodb_zip t11 Compressed 1024 0 +mysqltest_innodb_zip t12 Compressed 1024 0 +mysqltest_innodb_zip t13 Compressed 8192 0 +mysqltest_innodb_zip t14 Compact 16384 0 +mysqltest_innodb_zip t2 Redundant 16384 0 +mysqltest_innodb_zip t3 Compact 16384 0 +mysqltest_innodb_zip t4 Compact 16384 0 +mysqltest_innodb_zip t5 Redundant 16384 0 +mysqltest_innodb_zip t6 Redundant 16384 0 +mysqltest_innodb_zip t7 Redundant 16384 0 +mysqltest_innodb_zip t8 Compact 16384 0 +mysqltest_innodb_zip t9 Compact 16384 0 drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14; alter table t1 key_block_size=0; alter table t1 row_format=dynamic; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t1 Dynamic 16384 0 +mysqltest_innodb_zip t1 Dynamic 16384 0 alter table t1 row_format=compact; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t1 Compact 16384 0 +mysqltest_innodb_zip t1 Compact 16384 0 alter table t1 row_format=redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t1 Redundant 16384 0 +mysqltest_innodb_zip t1 Redundant 16384 0 drop table t1; create table t1(a int not null, b text, index(b(10))) engine=innodb key_block_size=1; @@ -124,12 +123,10 @@ select a,left(b,40) from t1 natural join t2; a left(b,40) 1 1abcdefghijklmnopqrstuvwxyzAAAAAAAAAAAAA SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t1 Compressed 2048 1024 -test t2 Compact 16384 0 +mysqltest_innodb_zip t1 Compressed 2048 1024 +mysqltest_innodb_zip t2 Compact 16384 0 drop table t1,t2; SET SESSION innodb_strict_mode = off; CREATE TABLE t1( @@ -203,11 +200,11 @@ drop table t1; set innodb_strict_mode = on; create table t1 (id int primary key) engine = innodb key_block_size = 0; create table t2 (id int primary key) engine = innodb key_block_size = 9; -ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16] -Error 1005 Can't create table `test`.`t2` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") create table t3 (id int primary key) engine = innodb key_block_size = 1; create table t4 (id int primary key) engine = innodb key_block_size = 2; create table t5 (id int primary key) engine = innodb key_block_size = 4; @@ -218,189 +215,179 @@ create table t9 (id int primary key) engine = innodb row_format = dynamic; create table t10(id int primary key) engine = innodb row_format = compact; create table t11(id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t1 Compact 16384 0 -test t10 Compact 16384 0 -test t11 Redundant 16384 0 -test t3 Compressed 1024 0 -test t4 Compressed 2048 0 -test t5 Compressed 4096 0 -test t6 Compressed 8192 0 -test t7 Compressed 16384 0 -test t8 Compressed 8192 0 -test t9 Dynamic 16384 0 +mysqltest_innodb_zip t1 Compact 16384 0 +mysqltest_innodb_zip t10 Compact 16384 0 +mysqltest_innodb_zip t11 Redundant 16384 0 +mysqltest_innodb_zip t3 Compressed 1024 0 +mysqltest_innodb_zip t4 Compressed 2048 0 +mysqltest_innodb_zip t5 Compressed 4096 0 +mysqltest_innodb_zip t6 Compressed 8192 0 +mysqltest_innodb_zip t7 Compressed 16384 0 +mysqltest_innodb_zip t8 Compressed 8192 0 +mysqltest_innodb_zip t9 Dynamic 16384 0 drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11; create table t1 (id int primary key) engine = innodb key_block_size = 8 row_format = compressed; create table t2 (id int primary key) engine = innodb key_block_size = 8 row_format = redundant; -ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE. -Error 1005 Can't create table `test`.`t2` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") create table t3 (id int primary key) engine = innodb key_block_size = 8 row_format = compact; -ERROR HY000: Can't create table `test`.`t3` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE. -Error 1005 Can't create table `test`.`t3` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") create table t4 (id int primary key) engine = innodb key_block_size = 8 row_format = dynamic; -ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong create options") create table t5 (id int primary key) engine = innodb key_block_size = 8 row_format = default; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t1 Compressed 8192 0 -test t5 Compressed 8192 0 +mysqltest_innodb_zip t1 Compressed 8192 0 +mysqltest_innodb_zip t5 Compressed 8192 0 drop table t1, t5; create table t1 (id int primary key) engine = innodb key_block_size = 9 row_format = redundant; -ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16] Warning 140 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") create table t2 (id int primary key) engine = innodb key_block_size = 9 row_format = compact; -ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16] Warning 140 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE. -Error 1005 Can't create table `test`.`t2` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") create table t2 (id int primary key) engine = innodb key_block_size = 9 row_format = dynamic; -ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16] Warning 140 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. -Error 1005 Can't create table `test`.`t2` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 set global innodb_file_per_table = off; create table t1 (id int primary key) engine = innodb key_block_size = 1; -ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") create table t2 (id int primary key) engine = innodb key_block_size = 2; -ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t2` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") create table t3 (id int primary key) engine = innodb key_block_size = 4; -ERROR HY000: Can't create table `test`.`t3` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t3` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") create table t4 (id int primary key) engine = innodb key_block_size = 8; -ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong create options") create table t5 (id int primary key) engine = innodb key_block_size = 16; -ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t5` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t5` (errno: 140 "Wrong create options") create table t6 (id int primary key) engine = innodb row_format = compressed; -ERROR HY000: Can't create table `test`.`t6` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t6` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") create table t7 (id int primary key) engine = innodb row_format = dynamic; -ERROR HY000: Can't create table `test`.`t7` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t7` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table. -Error 1005 Can't create table `test`.`t7` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t7` (errno: 140 "Wrong create options") create table t8 (id int primary key) engine = innodb row_format = compact; create table t9 (id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t8 Compact 16384 0 -test t9 Redundant 16384 0 +mysqltest_innodb_zip t8 Compact 16384 0 +mysqltest_innodb_zip t9 Redundant 16384 0 drop table t8, t9; set global innodb_file_per_table = on; set global innodb_file_format = `0`; create table t1 (id int primary key) engine = innodb key_block_size = 1; -ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") create table t2 (id int primary key) engine = innodb key_block_size = 2; -ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t2` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") create table t3 (id int primary key) engine = innodb key_block_size = 4; -ERROR HY000: Can't create table `test`.`t3` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t3` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") create table t4 (id int primary key) engine = innodb key_block_size = 8; -ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong create options") create table t5 (id int primary key) engine = innodb key_block_size = 16; -ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t5` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t5` (errno: 140 "Wrong create options") create table t6 (id int primary key) engine = innodb row_format = compressed; -ERROR HY000: Can't create table `test`.`t6` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t6` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") create table t7 (id int primary key) engine = innodb row_format = dynamic; -ERROR HY000: Can't create table `test`.`t7` (errno: 140 "Wrong create options") +ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t7` (errno: 140 "Wrong create options") show warnings; Level Code Message Warning 140 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t7` (errno: 140 "Wrong create options") +Error 1005 Can't create table `mysqltest_innodb_zip`.`t7` (errno: 140 "Wrong create options") create table t8 (id int primary key) engine = innodb row_format = compact; create table t9 (id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; table_schema table_name row_format data_length index_length -mysql innodb_index_stats Compact 16384 0 -mysql innodb_table_stats Compact 16384 0 -test t8 Compact 16384 0 -test t9 Redundant 16384 0 +mysqltest_innodb_zip t8 Compact 16384 0 +mysqltest_innodb_zip t9 Redundant 16384 0 drop table t8, t9; set global innodb_file_per_table=0; set global innodb_file_format=Antelope; diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test index 67bcda7697e..5de41ea6c37 100644 --- a/mysql-test/suite/innodb/t/innodb-zip.test +++ b/mysql-test/suite/innodb/t/innodb-zip.test @@ -1,6 +1,16 @@ -- source include/have_innodb.inc +--disable_warnings +DROP DATABASE IF EXISTS mysqltest_innodb_zip; +--enable_warnings + +CREATE DATABASE mysqltest_innodb_zip; +USE mysqltest_innodb_zip; +SELECT table_name, row_format, data_length, index_length + FROM information_schema.tables + WHERE table_schema='mysqltest_innodb_zip'; + let $per_table=`select @@innodb_file_per_table`; let $format=`select @@innodb_file_format`; let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`; @@ -40,19 +50,19 @@ row_format=compressed; create table t14(a int primary key) engine=innodb key_block_size=9; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14; alter table t1 key_block_size=0; alter table t1 row_format=dynamic; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; alter table t1 row_format=compact; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; alter table t1 row_format=redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t1; create table t1(a int not null, b text, index(b(10))) engine=innodb @@ -64,8 +74,8 @@ insert into t2 values(concat('1abcdefghijklmnopqrstuvwxyz', repeat('A',5000))); insert into t1 select 1, b from t2; commit; -connect (a,localhost,root,,); -connect (b,localhost,root,,); +connect (a,localhost,root,,mysqltest_innodb_zip); +connect (b,localhost,root,,mysqltest_innodb_zip); connection a; begin; @@ -85,7 +95,7 @@ disconnect a; disconnect b; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t1,t2; # The following should fail in non-strict mode too. @@ -198,7 +208,7 @@ create table t10(id int primary key) engine = innodb row_format = compact; create table t11(id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11; #test different values of ROW_FORMAT with KEY_BLOCK_SIZE @@ -230,7 +240,7 @@ create table t5 (id int primary key) engine = innodb key_block_size = 8 row_format = default; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t1, t5; #test multiple errors @@ -256,7 +266,7 @@ key_block_size = 9 row_format = dynamic; show warnings; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; #test valid values with innodb_file_per_table unset set global innodb_file_per_table = off; @@ -300,7 +310,7 @@ create table t8 (id int primary key) engine = innodb row_format = compact; create table t9 (id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t8, t9; #test valid values with innodb_file_format unset @@ -346,7 +356,7 @@ create table t8 (id int primary key) engine = innodb row_format = compact; create table t9 (id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length -FROM information_schema.tables WHERE engine='innodb'; +FROM information_schema.tables WHERE table_schema='mysqltest_innodb_zip'; drop table t8, t9; eval set global innodb_file_per_table=$per_table; @@ -383,3 +393,6 @@ drop table normal_table, zip_table; eval set global innodb_file_format=$format; eval set global innodb_file_per_table=$per_table; eval set session innodb_strict_mode=$innodb_strict_mode_orig; + +USE test; +DROP DATABASE mysqltest_innodb_zip;