From 69bc83fe6d9d67e368b44333f12704b747107a4e Mon Sep 17 00:00:00 2001 From: vasil <Unknown> Date: Mon, 2 Feb 2009 16:33:20 +0000 Subject: [PATCH] branches/zip: Fix the failing innodb-zip test to restore the environment as it was before the test execution because a newly added feature in the mysql-test framework does check for this. --- mysql-test/innodb-zip.result | 3 +++ mysql-test/innodb-zip.test | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/mysql-test/innodb-zip.result b/mysql-test/innodb-zip.result index c81401743a5..fab681c5ed3 100644 --- a/mysql-test/innodb-zip.result +++ b/mysql-test/innodb-zip.result @@ -419,3 +419,6 @@ select @@innodb_file_format_check; @@innodb_file_format_check Barracuda drop table normal_table, zip_table; +set global innodb_file_format=Antelope; +set global innodb_file_per_table=0; +set global innodb_file_format_check=Antelope; diff --git a/mysql-test/innodb-zip.test b/mysql-test/innodb-zip.test index abc23bf6997..9867af89e73 100644 --- a/mysql-test/innodb-zip.test +++ b/mysql-test/innodb-zip.test @@ -2,6 +2,7 @@ let $per_table=`select @@innodb_file_per_table`; let $format=`select @@innodb_file_format`; +let $innodb_file_format_check_orig=`select @@innodb_file_format_check`; set global innodb_file_per_table=off; set global innodb_file_format=`0`; @@ -331,3 +332,11 @@ show table status; select @@innodb_file_format_check; drop table normal_table, zip_table; -- disable_result_log + +# +# restore environment to the state it was before this test execution +# + +eval set global innodb_file_format=$format; +eval set global innodb_file_per_table=$per_table; +eval set global innodb_file_format_check=$innodb_file_format_check_orig; -- 2.30.9