bzr commit into mysql-5.0-bugteam branch (patrick.crews:2753)

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/mysqldump/mysql-5.0-bugteam/ based on revid:patrick.crews@stripped

 2753 Patrick Crews	2009-05-22 [merge]
      merge

    modified:
      mysql-test/r/func_compress.result
      mysql-test/t/func_compress.test
=== modified file 'mysql-test/r/func_compress.result'
--- a/mysql-test/r/func_compress.result	2009-05-20 08:30:06 +0000
+++ b/mysql-test/r/func_compress.result	2009-05-21 17:50:17 +0000
@@ -123,12 +123,6 @@ UNCOMPRESS(c1)	UNCOMPRESSED_LENGTH(c1)
 NULL	NULL
 NULL	NULL
 NULL	825307441
-Warnings:
-Error	1259	ZLIB: Input data corrupted
-Error	1259	ZLIB: Input data corrupted
-Error	1259	ZLIB: Input data corrupted
-Error	1259	ZLIB: Input data corrupted
-Error	1256	Uncompressed data size too large; the maximum size is 104857600 (probably, length of uncompressed data was corrupted)
 EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s;
 DROP TABLE t1;
 End of 5.0 tests

=== modified file 'mysql-test/t/func_compress.test'
--- a/mysql-test/t/func_compress.test	2009-05-20 08:30:06 +0000
+++ b/mysql-test/t/func_compress.test	2009-05-21 17:50:17 +0000
@@ -90,7 +90,10 @@ drop table t1;
 CREATE TABLE t1 (c1 INT);
 INSERT INTO t1 VALUES (1), (1111), (11111);
 
+# Disable warnings to avoid dependency on max_allowed_packet value
+--disable_warnings
 SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1;
+--enable_warnings
 
 # We do not need the results, just make sure there are no valgrind errors
 --disable_result_log


Attachment: [text/bzr-bundle] bzr/[e-mail]