diff --git a/mysql-test/innodb-zip.result b/mysql-test/innodb-zip.result index fab681c5ed3..c81401743a5 100644 --- a/mysql-test/innodb-zip.result +++ b/mysql-test/innodb-zip.result @@ -419,6 +419,3 @@ 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 9867af89e73..ddc39d44487 100644 --- a/mysql-test/innodb-zip.test +++ b/mysql-test/innodb-zip.test @@ -337,6 +337,7 @@ drop table normal_table, zip_table; # restore environment to the state it was before this test execution # +-- disable_query_log 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;