From 61ba356a9d1d55afa51e9c1885f646c5fdb42656 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Sep 2013 14:19:25 +0300 Subject: [PATCH] Innodb tests innodb_file_format cleanup. --- mysql-test/suite/innodb/r/innodb-zip.result | 2 ++ mysql-test/suite/innodb/r/innodb_file_format.result | 1 - mysql-test/suite/innodb/t/innodb-index.test | 8 ++++++++ mysql-test/suite/innodb/t/innodb-zip.test | 6 +++++- mysql-test/suite/innodb/t/innodb_bug47167.test | 5 +++++ mysql-test/suite/innodb/t/innodb_file_format.test | 4 ++++ 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb/r/innodb-zip.result index 95a3142068b..4c55cccb28a 100644 --- a/mysql-test/suite/innodb/r/innodb-zip.result +++ b/mysql-test/suite/innodb/r/innodb-zip.result @@ -362,3 +362,5 @@ select @@innodb_file_format_max; @@innodb_file_format_max Barracuda drop table normal_table, zip_table; +USE test; +DROP DATABASE mysqltest_innodb_zip; diff --git a/mysql-test/suite/innodb/r/innodb_file_format.result b/mysql-test/suite/innodb/r/innodb_file_format.result index 82b4c6fab60..77328a360a9 100644 --- a/mysql-test/suite/innodb/r/innodb_file_format.result +++ b/mysql-test/suite/innodb/r/innodb_file_format.result @@ -46,4 +46,3 @@ Antelope set global innodb_file_format_max=antelope; set global innodb_file_format_check=off; ERROR HY000: Variable 'innodb_file_format_check' is a read only variable -SET GLOBAL innodb_file_format=Antelope; diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test index b9b98a98f58..ce2d69b7bba 100644 --- a/mysql-test/suite/innodb/t/innodb-index.test +++ b/mysql-test/suite/innodb/t/innodb-index.test @@ -1,5 +1,8 @@ -- 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`; + let $MYSQLD_DATADIR= `select @@datadir`; let $per_table=`select @@innodb_file_per_table`; @@ -556,3 +559,8 @@ show create table t2c; --disable_info DROP TABLE t1,t2,t2c,t2i; + +--disable_query_log +eval SET GLOBAL innodb_file_format=$innodb_file_format_orig; +eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig; +--enable_query_log diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test index 1d904f69ffc..4a72169d5ec 100644 --- a/mysql-test/suite/innodb/t/innodb-zip.test +++ b/mysql-test/suite/innodb/t/innodb-zip.test @@ -14,6 +14,8 @@ SELECT table_name, row_format, data_length, index_length let $per_table=`select @@innodb_file_per_table`; let $format=`select @@innodb_file_format`; let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`; +let $innodb_file_format_orig=`select @@innodb_file_format`; +let $innodb_file_format_max_orig=`select @@innodb_file_format_max`; SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; @@ -332,8 +334,10 @@ 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; - +eval SET GLOBAL innodb_file_format=$innodb_file_format_orig; +eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig; SET @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata; +--enable_query_log USE test; DROP DATABASE mysqltest_innodb_zip; diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test index 505c21547b2..88adfc753a9 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47167.test +++ b/mysql-test/suite/innodb/t/innodb_bug47167.test @@ -44,3 +44,8 @@ set global innodb_file_format_max = on; --error ER_WRONG_VALUE_FOR_VAR set global innodb_file_format_max = off; --enable_warnings + +# Put the saved value back to 'innodb_file_format_max' +--disable_query_log +set global innodb_file_format_max = @old_innodb_file_format_max; +--enable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test index f45083101c0..2c99167ce6e 100644 --- a/mysql-test/suite/innodb/t/innodb_file_format.test +++ b/mysql-test/suite/innodb/t/innodb_file_format.test @@ -2,6 +2,7 @@ -- 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`; select @@innodb_file_format; select @@innodb_file_format_check; @@ -37,4 +38,7 @@ set global innodb_file_format_max=antelope; --error ER_INCORRECT_GLOBAL_LOCAL_VAR set global innodb_file_format_check=off; +--disable_query_log eval SET GLOBAL innodb_file_format=$innodb_file_format_orig; +eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig; +--enable_query_log