From 1a6c97369f0412417cf82bb5f6d56d62bd149676 Mon Sep 17 00:00:00 2001
From: vasil <>
Date: Wed, 25 Feb 2009 19:33:32 +0000
Subject: [PATCH] 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 | 3 ---
 mysql-test/innodb-zip.test   | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

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;