merge

mysql-test/r/func_compress.result

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

mysql-test/t/func_compress.test

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