branches/zip:

Do not output the commands that restore the environment because they depend
on the state of the environment before the test starts executing.

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;

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;