diff options
Diffstat (limited to 'mysql-test/suite/innodb_zip/t')
17 files changed, 50 insertions, 191 deletions
diff --git a/mysql-test/suite/innodb_zip/t/bug36169.test b/mysql-test/suite/innodb_zip/t/bug36169.test index 07566b20..8ab970f6 100644 --- a/mysql-test/suite/innodb_zip/t/bug36169.test +++ b/mysql-test/suite/innodb_zip/t/bug36169.test @@ -5,9 +5,6 @@ -- source include/innodb_page_size_small.inc -let $file_per_table=`select @@innodb_file_per_table`; -SET GLOBAL innodb_file_per_table=ON; - # # The following is copied from http://bugs.mysql.com/36169 # (http://bugs.mysql.com/file.php?id=9121) @@ -1155,7 +1152,5 @@ DROP TABLE IF EXISTS table2; DROP TABLE IF EXISTS table3; DROP TABLE IF EXISTS table4; DROP TABLE IF EXISTS table5; +-- enable_query_log DROP TABLE IF EXISTS table6; - -EVAL SET GLOBAL innodb_file_per_table=$file_per_table; -SET sql_mode = default; diff --git a/mysql-test/suite/innodb_zip/t/bug53591.test b/mysql-test/suite/innodb_zip/t/bug53591.test index 17c79e0f..ef4d12ad 100644 --- a/mysql-test/suite/innodb_zip/t/bug53591.test +++ b/mysql-test/suite/innodb_zip/t/bug53591.test @@ -2,13 +2,6 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the row size is'); -let $file_per_table=`select @@innodb_file_per_table`; - -SET GLOBAL innodb_file_per_table=on; -SET GLOBAL innodb_strict_mode=on; - -set old_alter_table=0; - CREATE TABLE bug53591(a text charset utf8 not null) ENGINE=InnoDB KEY_BLOCK_SIZE=1; -- replace_result 8126 {checked_valid} 4030 {checked_valid} 1982 {checked_valid} @@ -18,6 +11,3 @@ ALTER TABLE bug53591 ADD PRIMARY KEY(a(220)); SHOW WARNINGS; DROP TABLE bug53591; - -EVAL SET GLOBAL innodb_file_per_table=$file_per_table; -SET GLOBAL innodb_strict_mode=DEFAULT; diff --git a/mysql-test/suite/innodb_zip/t/bug56680.test b/mysql-test/suite/innodb_zip/t/bug56680.test index 54cbc7ca..adb632af 100644 --- a/mysql-test/suite/innodb_zip/t/bug56680.test +++ b/mysql-test/suite/innodb_zip/t/bug56680.test @@ -15,8 +15,7 @@ -- error 0,ER_UNKNOWN_SYSTEM_VARIABLE SET GLOBAL innodb_change_buffering_debug = 1; -- enable_query_log -SET GLOBAL tx_isolation='REPEATABLE-READ'; -SET GLOBAL innodb_file_per_table=on; +SET GLOBAL transaction_isolation='REPEATABLE-READ'; CREATE TABLE bug56680( a INT AUTO_INCREMENT PRIMARY KEY, @@ -51,7 +50,7 @@ SELECT b FROM bug56680; # For the rest of this test, use the READ UNCOMMITTED isolation level # to see what exists in the secondary index. -SET GLOBAL tx_isolation='READ-UNCOMMITTED'; +SET GLOBAL transaction_isolation='READ-UNCOMMITTED'; # Create enough rows for the table, so that the insert buffer will be # used for modifying the secondary index page. There must be multiple diff --git a/mysql-test/suite/innodb_zip/t/cmp_drop_table.test b/mysql-test/suite/innodb_zip/t/cmp_drop_table.test index ae6bfd9f..e64514fc 100644 --- a/mysql-test/suite/innodb_zip/t/cmp_drop_table.test +++ b/mysql-test/suite/innodb_zip/t/cmp_drop_table.test @@ -3,12 +3,8 @@ # scans through pages -- source include/not_encrypted.inc -let $per_table=`select @@innodb_file_per_table`; - -- let $query_i_s = SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0 -set global innodb_file_per_table=on; - create table t1(a text) engine=innodb key_block_size=4; -- disable_query_log @@ -50,10 +46,3 @@ while ($i) -- eval $query_i_s drop table t2; - -# -# restore environment to the state it was before this test execution -# - --- disable_query_log -eval set global innodb_file_per_table=$per_table; diff --git a/mysql-test/suite/innodb_zip/t/create_options.test b/mysql-test/suite/innodb_zip/t/create_options.test index fce64060..9840a28a 100644 --- a/mysql-test/suite/innodb_zip/t/create_options.test +++ b/mysql-test/suite/innodb_zip/t/create_options.test @@ -59,11 +59,6 @@ --source include/innodb_page_size_small.inc SET default_storage_engine=InnoDB; -# These values can change during the test -LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`; - -SET GLOBAL innodb_file_per_table=ON; - # The first half of these tests are with strict mode ON. SET SESSION innodb_strict_mode = ON; @@ -481,7 +476,3 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE --echo # Cleanup DROP TABLE t1; - ---disable_query_log -EVAL SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig; ---enable_query_log diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix.test b/mysql-test/suite/innodb_zip/t/index_large_prefix.test index a254c4e6..65634542 100644 --- a/mysql-test/suite/innodb_zip/t/index_large_prefix.test +++ b/mysql-test/suite/innodb_zip/t/index_large_prefix.test @@ -10,10 +10,6 @@ SET @save_innodb_read_only_compressed=@@GLOBAL.innodb_read_only_compressed; SET GLOBAL innodb_read_only_compressed=OFF; --enable_query_log -let $innodb_file_per_table_orig=`select @@innodb_file_per_table`; - -set global innodb_file_per_table=1; - -- echo ### Test 1 ### # Create a table of DYNAMIC format, with a primary index of 1000 bytes in # size @@ -44,7 +40,7 @@ update worklog5743 set a = (repeat("x", 17000)); # Start a new session to select the column to force it build # an earlier version of the clustered index through undo log. So it should # just see the result of repeat("b", 16000) -select @@session.tx_isolation; +select @@session.transaction_isolation; --connect (con1,localhost,root,,) select a = repeat("x", 17000) from worklog5743; select a = repeat("b", 16000) from worklog5743; @@ -53,7 +49,7 @@ select a = repeat("b", 16000) from worklog5743; # should see the uncommitted update --connect (con2,localhost,root,,) SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a = repeat("x", 17000) from worklog5743; # Roll back the transaction @@ -77,7 +73,7 @@ update worklog5743 set a1 = 1000; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; @@ -85,7 +81,7 @@ select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; --connection default @@ -107,7 +103,7 @@ update worklog5743 set a1 = 1000; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; @@ -115,7 +111,7 @@ select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; --connection default @@ -251,7 +247,7 @@ select a1, left(a2, 20) from worklog5743_16; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9; explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9; explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9; @@ -267,7 +263,7 @@ select a1, left(a2, 20) from worklog5743_16 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, left(a2, 20) from worklog5743_1 where a1 = 9; select a1, left(a2, 20) from worklog5743_2 where a1 = 9; select a1, left(a2, 20) from worklog5743_4 where a1 = 9; @@ -322,14 +318,14 @@ update worklog5743 set a1 = 1000; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1 from worklog5743 where a1 = 9; select a1 from worklog5743 where a1 = 9; # Do read uncommitted, it would show there is no row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1 from worklog5743 where a1 = 9; --connection default @@ -362,14 +358,14 @@ update worklog5743 set a = (repeat("x", 25000)); # Start a new session to select the table to force it build # an earlier version of the cluster index through undo log -select @@session.tx_isolation; +select @@session.transaction_isolation; --connection con1 select a = repeat("a", 20000) from worklog5743; --disconnect con1 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a = repeat("x", 25000) from worklog5743; --disconnect con2 @@ -408,5 +404,3 @@ create index idx2 on worklog5743(a(767)); SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed; --enable_query_log drop table worklog5743; - -eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig; diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test b/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test index c1c8f49c..8b3a2af9 100644 --- a/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test +++ b/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test @@ -8,10 +8,6 @@ SET default_storage_engine=InnoDB; call mtr.add_suppression("Cannot add field .* in table .* because after adding it, the row size is"); --enable_query_log -let $innodb_file_per_table_orig=`select @@innodb_file_per_table`; - -set global innodb_file_per_table=1; - -- echo ### Test 1 ### # Create a table of DYNAMIC format, with a primary index of 768 bytes in # size @@ -43,7 +39,7 @@ update worklog5743 set a = (repeat("x", 17000)); # Start a new session to select the column to force it build # an earlier version of the clustered index through undo log. So it should # just see the result of repeat("b", 16000) -select @@session.tx_isolation; +select @@session.transaction_isolation; --connect (con1,localhost,root,,) select a = repeat("x", 17000) from worklog5743; select a = repeat("b", 16000) from worklog5743; @@ -52,7 +48,7 @@ select a = repeat("b", 16000) from worklog5743; # should see the uncommitted update --connect (con2,localhost,root,,) SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a = repeat("x", 17000) from worklog5743; # Roll back the transaction @@ -76,7 +72,7 @@ update worklog5743 set a1 = 1111; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; @@ -84,7 +80,7 @@ select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; --connection default @@ -106,7 +102,7 @@ update worklog5743 set a1 = 2222; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; @@ -114,7 +110,7 @@ select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; --connection default @@ -199,7 +195,7 @@ select a1, left(a2, 20) from worklog5743_4; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9; explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9; explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9; @@ -211,7 +207,7 @@ select a1, left(a2, 20) from worklog5743_4 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, left(a2, 20) from worklog5743_1 where a1 = 9; select a1, left(a2, 20) from worklog5743_2 where a1 = 9; select a1, left(a2, 20) from worklog5743_4 where a1 = 9; @@ -297,14 +293,14 @@ update worklog5743 set a1 = 4444; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1 from worklog5743 where a1 = 9; select a1 from worklog5743 where a1 = 9; # Do read uncommitted, it would show there is no row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1 from worklog5743 where a1 = 9; --connection default @@ -334,14 +330,14 @@ update worklog5743 set a = (repeat("x", 25000)); # Start a new session to select the table to force it build # an earlier version of the cluster index through undo log -select @@session.tx_isolation; +select @@session.transaction_isolation; --connection con1 select a = repeat("a", 20000) from worklog5743; --disconnect con1 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a = repeat("x", 25000) from worklog5743; --disconnect con2 @@ -380,6 +376,3 @@ create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT; create index idx on worklog5743(a(768)); create index idx2 on worklog5743(a(767)); drop table worklog5743; - - -eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig; diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test b/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test index bacde564..cc41b13d 100644 --- a/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test +++ b/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test @@ -8,10 +8,6 @@ SET default_storage_engine=InnoDB; call mtr.add_suppression("Cannot add field .* in table .* because after adding it, the row size is"); --enable_query_log -let $innodb_file_per_table_orig=`select @@innodb_file_per_table`; - -set global innodb_file_per_table=1; - -- echo ### Test 1 ### # Create a table of DYNAMIC format, with a primary index of 1000 bytes in # size @@ -44,7 +40,7 @@ update worklog5743 set a = (repeat("x", 17000)); # Start a new session to select the column to force it build # an earlier version of the clustered index through undo log. So it should # just see the result of repeat("b", 16000) -select @@session.tx_isolation; +select @@session.transaction_isolation; --connect (con1,localhost,root,,) select a = repeat("x", 17000) from worklog5743; select a = repeat("b", 16000) from worklog5743; @@ -53,7 +49,7 @@ select a = repeat("b", 16000) from worklog5743; # should see the uncommitted update --connect (con2,localhost,root,,) SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a = repeat("x", 17000) from worklog5743; # Roll back the transaction @@ -77,7 +73,7 @@ update worklog5743 set a1 = 1000; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; @@ -85,7 +81,7 @@ select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; --connection default @@ -107,7 +103,7 @@ update worklog5743 set a1 = 1000; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; @@ -115,7 +111,7 @@ select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; --connection default @@ -219,7 +215,7 @@ select a1, left(a2, 20) from worklog5743_8; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9; explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9; explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9; @@ -233,7 +229,7 @@ select a1, left(a2, 20) from worklog5743_8 where a1 = 9; # row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1, left(a2, 20) from worklog5743_1 where a1 = 9; select a1, left(a2, 20) from worklog5743_2 where a1 = 9; select a1, left(a2, 20) from worklog5743_4 where a1 = 9; @@ -316,14 +312,14 @@ update worklog5743 set a1 = 1000; # Do a select from another connection that would use the secondary index --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; explain select a1 from worklog5743 where a1 = 9; select a1 from worklog5743 where a1 = 9; # Do read uncommitted, it would show there is no row with a1 = 9 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a1 from worklog5743 where a1 = 9; --connection default @@ -355,14 +351,14 @@ update worklog5743 set a = (repeat("x", 25000)); # Start a new session to select the table to force it build # an earlier version of the cluster index through undo log -select @@session.tx_isolation; +select @@session.transaction_isolation; --connection con1 select a = repeat("a", 20000) from worklog5743; --disconnect con1 --connection con2 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; select a = repeat("x", 25000) from worklog5743; --disconnect con2 @@ -397,6 +393,3 @@ create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT; create index idx on worklog5743(a(768)); create index idx2 on worklog5743(a(767)); drop table worklog5743; - - -eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig; diff --git a/mysql-test/suite/innodb_zip/t/innochecksum_2.test b/mysql-test/suite/innodb_zip/t/innochecksum_2.test index 57926d92..f6b0e5de 100644 --- a/mysql-test/suite/innodb_zip/t/innochecksum_2.test +++ b/mysql-test/suite/innodb_zip/t/innochecksum_2.test @@ -57,7 +57,7 @@ open IN_FILE,"<", "$dir/tmp/$file" or die $!; open OUT_FILE, ">", "$dir/tmp/tmpfile" or die $!; while(<IN_FILE>) { unless ($_=~ /^debug.*$/ || $_=~ /\-#, \-\-debug.*$/ || $_=~ /http:.*html/) { - $_=~ s/^\S*innochecksum.+Ver.+[0-9]*\.[0-9]*\.[0-9]*.+$/innochecksum Ver #.#.#/g; + $_=~ s/^\S*innochecksum.* from .+$/innochecksum Ver #.#.#/g; $_=~ s/(Copyright\s\(c\))\s([0-9]*),\s([0-9]*)(.*)/$1 YEAR, YEAR $4/g; $_=~ s/Usage:.*\[-c/Usage: innochecksum [-c/g; print OUT_FILE $_; @@ -80,7 +80,7 @@ EOF --exec $INNOCHECKSUM -c $MYSQLD_DATADIR/test/t1.ibd --echo [4]:# Print the version of innochecksum and exit ---replace_regex /.*innochecksum.*Ver.*[0-9]*.[0-9]*.[0-9]*.*/innochecksum Ver #.#.#/ +--replace_regex /for \S+/for OS/ /\d+/#/ /#[-_A-Za-z0-9]*-MariaDB,/#-MariaDB,/ /\(.*\)/(ARCH)/ /^.*innochecksum(\.exe)?/innochecksum/ --exec $INNOCHECKSUM -V $MYSQLD_DATADIR/test/t1.ibd --echo # Restart the DB server diff --git a/mysql-test/suite/innodb_zip/t/innodb-zip.test b/mysql-test/suite/innodb_zip/t/innodb-zip.test index 507900aa..47867f3f 100644 --- a/mysql-test/suite/innodb_zip/t/innodb-zip.test +++ b/mysql-test/suite/innodb_zip/t/innodb-zip.test @@ -6,12 +6,12 @@ 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`; SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; --let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name set session innodb_strict_mode=0; +SET @save_fpt=@@GLOBAL.innodb_file_per_table; set global innodb_file_per_table=off; SET @@global.innodb_stats_on_metadata=ON; @@ -123,8 +123,6 @@ select count(*) from t1 where c4 = repeat('C', 20000); update t1 set c3 = repeat('E', 20000) where c1 = 1; drop table t1; -set global innodb_file_per_table = on; - set innodb_strict_mode = off; create table t1 (id int primary key) engine = innodb key_block_size = 0; drop table t1; @@ -254,9 +252,7 @@ drop table t7, t8, t9; # restore environment to the state it was before this test execution # --- disable_query_log -eval set global innodb_file_per_table=$per_table; +SET GLOBAL innodb_file_per_table=@save_fpt; SET @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata; ---enable_query_log DROP DATABASE mysqltest_innodb_zip; diff --git a/mysql-test/suite/innodb_zip/t/large_blob.test b/mysql-test/suite/innodb_zip/t/large_blob.test index dd208129..d8163737 100644 --- a/mysql-test/suite/innodb_zip/t/large_blob.test +++ b/mysql-test/suite/innodb_zip/t/large_blob.test @@ -7,9 +7,6 @@ --source include/big_test.inc --disable_query_log -# These values can change during the test -let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`; - # Create a 20MB blob that does not compress easily. # 1000 Random characters is enough to keep compression low. set @alphabet="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -27,8 +24,6 @@ while ($1 > 1) set @longblob=repeat(@blob,200000); --enable_query_log -call mtr.add_suppression("InnoDB: Warning: a long semaphore wait"); - SET GLOBAL innodb_file_per_table = OFF; --echo # @@ -123,7 +118,3 @@ CREATE TABLE t1 ( INSERT INTO t1 VALUES (1, ''); UPDATE t1 SET c2=@longblob; DROP TABLE t1; - ---disable_query_log -EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig; ---enable_query_log diff --git a/mysql-test/suite/innodb_zip/t/page_size.test b/mysql-test/suite/innodb_zip/t/page_size.test index 3455ef8e..ef8f8693 100644 --- a/mysql-test/suite/innodb_zip/t/page_size.test +++ b/mysql-test/suite/innodb_zip/t/page_size.test @@ -728,29 +728,6 @@ SHOW WARNINGS; ROLLBACK; DROP TABLE bug12547647; -# -# Bug #13336585 - INNODB: CHANGE BUFFERING WITH 4K PAGES CAN ASSERT -# IF SECONDARY KEY IS NEAR MAX -# If the secondary index tuple is close to half the page size, -# ibuf_insert_low() could return DB_TOO_BIG_RECORD, which is not expected -# in ibuf_insert(). In order to insure this does not happen, WL5756 -# imposes a maximum key length of 768 for 4k pages and 1536 for 8k pages. -# The existing max key Size for 16k pages is 3072. -# - -#-- disable_query_log -# The flag innodb_change_buffering_debug is only available in debug builds. -# It instructs InnoDB to try to evict pages from the buffer pool when -# change buffering is possible, so that the change buffer will be used -# whenever possible. -# This flag is not used currently since it exposes valgrind error in ibuf -# code with the following SQL -#-- error 0,ER_UNKNOWN_SYSTEM_VARIABLE -#SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug; -#-- error 0,ER_UNKNOWN_SYSTEM_VARIABLE -#SET GLOBAL innodb_change_buffering_debug = 1; -#-- enable_query_log - # make sure the largest possible key entry can be added to the insert buffer. # Make enough records so that the root page is not a leaf page. SET SESSION innodb_strict_mode = OFF; @@ -823,11 +800,6 @@ INSERT INTO t1 VALUES(@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r,@r, DELETE from t1; DROP TABLE t1; -#-- disable_query_log -#-- error 0,ER_UNKNOWN_SYSTEM_VARIABLE -#SET GLOBAL innodb_change_buffering_debug = 0; -#-- enable_query_log - # The following should fail in non-strict mode too. # (The fix of Bug #50945 only affects REDUNDANT and COMPACT tables.) if ($INNODB_PAGE_SIZE == 4096) diff --git a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test index 32d7eacd..de27ddce 100644 --- a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test +++ b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test @@ -722,11 +722,11 @@ SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM worklog5743; --connection con1 -select @@session.tx_isolation; +select @@session.transaction_isolation; SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM worklog5743; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM worklog5743; SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; @@ -789,7 +789,7 @@ WHERE info='COMMIT'; --connection con1 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -select @@session.tx_isolation; +select @@session.transaction_isolation; SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM worklog5743; SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; diff --git a/mysql-test/suite/innodb_zip/t/restart.test b/mysql-test/suite/innodb_zip/t/restart.test index 0c8073b8..18c90eff 100644 --- a/mysql-test/suite/innodb_zip/t/restart.test +++ b/mysql-test/suite/innodb_zip/t/restart.test @@ -34,12 +34,8 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot --disable_query_log let $MYSQL_DATA_DIR= `select @@datadir`; let $data_directory = DATA DIRECTORY='$MYSQL_TMP_DIR/alt_dir'; - -let $innodb_file_per_table_orig=`select @@innodb_file_per_table`; --enable_query_log -set global innodb_file_per_table=on; - --echo # --echo # Create and insert records into a REDUNDANT row formatted table. --echo # @@ -181,7 +177,6 @@ SELECT count(*) FROM t7_restart; --echo # --source include/start_mysqld.inc -SHOW VARIABLES LIKE 'innodb_file_per_table'; SHOW CREATE TABLE t1_restart; SHOW CREATE TABLE t2_restart; SHOW CREATE TABLE t3_restart; @@ -274,8 +269,6 @@ SHOW CREATE TABLE t7_restart; --echo # --source include/start_mysqld.inc -SHOW VARIABLES LIKE 'innodb_file_per_table'; - --source suite/innodb/include/show_i_s_tablespaces.inc SELECT count(*) FROM t5_restart; @@ -364,7 +357,6 @@ SHOW CREATE TABLE t77_restart; --echo # Restart the server --echo # --source include/restart_mysqld.inc -SHOW VARIABLES LIKE 'innodb_file_per_table'; --source suite/innodb/include/show_i_s_tablespaces.inc @@ -599,8 +591,3 @@ DROP TABLE t77_restart; --rmdir $MYSQL_TMP_DIR/alt_dir --rmdir $MYSQL_TMP_DIR/new_dir/test --rmdir $MYSQL_TMP_DIR/new_dir - --- disable_query_log -eval set global innodb_file_per_table=$innodb_file_per_table_orig; --- enable_query_log - diff --git a/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test b/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test index 47b53b71..97a1909a 100644 --- a/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test +++ b/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test @@ -226,21 +226,6 @@ do "$ENV{MTR_SUITE_DIR}/../innodb/include/innodb-util.pl"; ib_restore_tablespaces("test", "t1"); EOF -# Test failure after ibuf check -SET SESSION debug_dbug="+d,ib_import_check_bitmap_failure"; - -# Need proper mapping of error codes :-( ---error ER_NOT_KEYFILE -ALTER TABLE t1 IMPORT TABLESPACE; - -SET SESSION debug_dbug=@saved_debug_dbug; - -# Restore files -perl; -do "$ENV{MTR_SUITE_DIR}/../innodb/include/innodb-util.pl"; -ib_restore_tablespaces("test", "t1"); -EOF - # Test failure after adjusting the cluster index root page SET SESSION debug_dbug="+d,ib_import_cluster_root_adjust_failure"; diff --git a/mysql-test/suite/innodb_zip/t/wl5522_zip.test b/mysql-test/suite/innodb_zip/t/wl5522_zip.test index dbb698cc..f223d36a 100644 --- a/mysql-test/suite/innodb_zip/t/wl5522_zip.test +++ b/mysql-test/suite/innodb_zip/t/wl5522_zip.test @@ -83,7 +83,7 @@ ALTER TABLE t1 IMPORT TABLESPACE; SELECT * FROM t1; DROP TABLE t1; -# Export/import on the same instance, with --innodb-file-per-table=1 +# Export/import on the same instance CREATE TABLE t1( c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, c2 INT) ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2; @@ -127,7 +127,7 @@ SELECT COUNT(*) FROM t1; DROP TABLE t1; -# Export/import on the same instance, with --innodb-file-per-table=1 +# Export/import on the same instance # Insert some more records to move the LSN forward and then drop the # table and restore CREATE TABLE t1( @@ -174,7 +174,7 @@ SELECT COUNT(*) FROM t1; DROP TABLE t1; -# Export/import on the same instance, with --innodb-file-per-table=1 +# Export/import on the same instance # Insert some more records to move the LSN forward and then drop the # table and restore, this time the table has a secondary index too. CREATE TABLE t1( @@ -217,7 +217,7 @@ SELECT COUNT(*) FROM t1 WHERE c2 = 1; DROP TABLE t1; -# Export/import on the same instance, with --innodb-file-per-table=1 +# Export/import on the same instance # Insert some more records to move the LSN forward and then drop the # table and restore, this time the table has a secondary index too. # Rename the index on the create so that the IMPORT fails, drop index diff --git a/mysql-test/suite/innodb_zip/t/wl6347_comp_indx_stat.test b/mysql-test/suite/innodb_zip/t/wl6347_comp_indx_stat.test index be9a05b3..ae32b03a 100644 --- a/mysql-test/suite/innodb_zip/t/wl6347_comp_indx_stat.test +++ b/mysql-test/suite/innodb_zip/t/wl6347_comp_indx_stat.test @@ -20,7 +20,6 @@ let MYSQLD_DATADIR=`SELECT @@datadir`; let $innodb_compression_level = `SELECT @@global.innodb_compression_level`; --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_cmp_per_index_enabled=ON; SET GLOBAL innodb_compression_level=0; --disable_query_log @@ -73,7 +72,6 @@ SET GLOBAL innodb_read_only_compressed=OFF; --enable_query_log --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_compression_level=0; --echo # fetch the compressed page and check the stats @@ -135,7 +133,6 @@ SET @inl_val=2; SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_compression_level=0; --echo # fetch the compressed page and check the stats @@ -296,7 +293,6 @@ SET GLOBAL innodb_cmp_per_index_enabled=0; SET GLOBAL innodb_cmp_per_index_enabled=1; --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_compression_level=9; @@ -345,7 +341,6 @@ SET @inl_val=2; SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_compression_level=9; @@ -413,7 +408,6 @@ SET @inl_val=2; SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_compression_level=9; @@ -801,7 +795,6 @@ SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # check the flags SELECT @@innodb_cmp_per_index_enabled; SELECT @@innodb_compression_failure_threshold_pct; -SELECT @@innodb_file_per_table; SELECT @@innodb_compression_level; --echo #****************************************************************** @@ -848,8 +841,6 @@ SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # set the flags SET GLOBAL innodb_compression_failure_threshold_pct=0; -SET GLOBAL innodb_file_per_table=on; - --echo # fetch the compressed page and check the stats --echo # The stats figure may be different/same for each restart. @@ -1053,7 +1044,6 @@ SET GLOBAL innodb_cmp_per_index_enabled=OFF; SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # set the flags -SET GLOBAL innodb_file_per_table=on; SET GLOBAL innodb_cmp_per_index_enabled=ON; SET GLOBAL innodb_compression_failure_threshold_pct=10; SET GLOBAL innodb_compression_level=Default; @@ -1062,7 +1052,6 @@ SET GLOBAL innodb_compression_level=Default; --echo # check the flags SELECT @@innodb_cmp_per_index_enabled; SELECT @@innodb_compression_failure_threshold_pct; -SELECT @@innodb_file_per_table; SELECT @@innodb_compression_level; --echo #****************************************************************** @@ -1109,9 +1098,6 @@ SET GLOBAL innodb_cmp_per_index_enabled=ON; --echo # set the flags SET GLOBAL innodb_compression_failure_threshold_pct=10; -SET GLOBAL innodb_file_per_table=on; -SET GLOBAL innodb_compression_failure_threshold_pct=10; - --echo # fetch the compressed page and check the stats --echo # The stats figure may be different/same for each restart. @@ -1312,7 +1298,6 @@ DROP TABLE tab5; SET GLOBAL innodb_cmp_per_index_enabled=0; SET GLOBAL innodb_cmp_per_index_enabled=1; -SET GLOBAL innodb_file_per_table=ON; SET GLOBAL innodb_compression_level=default; SET GLOBAL innodb_compression_failure_threshold_pct=default; @@ -1351,7 +1336,6 @@ DROP TABLE tab5, test.tab5; DROP DATABASE sb; --echo # reset the flags -eval SET GLOBAL innodb_file_per_table=default; eval SET GLOBAL innodb_cmp_per_index_enabled=default; --disable_query_log eval SET GLOBAL innodb_compression_level=$innodb_compression_level; |