From 050cf69f11a1fdc844524a371119bfc473f580b7 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Sat, 31 Jan 2009 14:10:43 -0200
Subject: [PATCH] Fix test cases to preserve the state that existed before the
 test case was executed.

mysql-test/r/func_compress.result:
  Update test case result.
mysql-test/r/innodb_bug34300.result:
  Update test case result.
mysql-test/t/func_compress.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value.
mysql-test/t/innodb_bug34300.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value and enable query log.
---
 mysql-test/r/func_compress.result   | 1 +
 mysql-test/r/innodb_bug34300.result | 5 +++++
 mysql-test/t/func_compress.test     | 3 +++
 mysql-test/t/innodb_bug34300.test   | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result
index def03deb351..8e14b7695ee 100644
--- a/mysql-test/r/func_compress.result
+++ b/mysql-test/r/func_compress.result
@@ -72,6 +72,7 @@ set @@global.max_allowed_packet=1048576*100;
 select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;
 compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null
 0
+set @@global.max_allowed_packet=default;
 create table t1(a blob);
 insert into t1 values(NULL), (compress('a'));
 select uncompress(a), uncompressed_length(a) from t1;
diff --git a/mysql-test/r/innodb_bug34300.result b/mysql-test/r/innodb_bug34300.result
index ae9fee81ad7..03ae355de7b 100644
--- a/mysql-test/r/innodb_bug34300.result
+++ b/mysql-test/r/innodb_bug34300.result
@@ -1,4 +1,9 @@
+SELECT f4, f8 FROM bug34300;
 f4	f8
 xxx	zzz
+ALTER TABLE bug34300 ADD COLUMN (f10 INT);
+SELECT f4, f8 FROM bug34300;
 f4	f8
 xxx	zzz
+DROP TABLE bug34300;
+SET @@global.max_allowed_packet=default;
diff --git a/mysql-test/t/func_compress.test b/mysql-test/t/func_compress.test
index 7f17fd2180f..0a3a3823fee 100644
--- a/mysql-test/t/func_compress.test
+++ b/mysql-test/t/func_compress.test
@@ -49,6 +49,9 @@ set @@global.max_allowed_packet=1048576*100;
 # reconnect to make the new max packet size take effect
 --connect (newconn, localhost, root,,)
 eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;
+disconnect newconn;
+connection default;
+set @@global.max_allowed_packet=default;
 
 #
 # Bug #18643: problem with null values
diff --git a/mysql-test/t/innodb_bug34300.test b/mysql-test/t/innodb_bug34300.test
index 114bcf98c25..432ddd03547 100644
--- a/mysql-test/t/innodb_bug34300.test
+++ b/mysql-test/t/innodb_bug34300.test
@@ -21,6 +21,7 @@ CREATE TABLE bug34300 (
 
 INSERT INTO bug34300 VALUES ('xxx', repeat('a', 8459264), 'zzz');
 
+-- enable_query_log
 -- enable_result_log
 
 SELECT f4, f8 FROM bug34300;
@@ -30,3 +31,7 @@ ALTER TABLE bug34300 ADD COLUMN (f10 INT);
 SELECT f4, f8 FROM bug34300;
 
 DROP TABLE bug34300;
+
+disconnect newconn;
+connection default;
+SET @@global.max_allowed_packet=default;