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

@@ -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;

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;