Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

mysql-test/r/func_compress.result

@@ -69,6 +69,6 @@ Error	1259	ZLIB: Input data corrupted
 Error	1256	Uncompressed data size too large; the maximum size is 1048576 (probably, length of uncompressed data was corrupted)
 drop table t1;
 set @@max_allowed_packet=1048576*100;
-select length(compress(repeat('aaaaaaaaaa', 10000000)));
-length(compress(repeat('aaaaaaaaaa', 10000000)))
-97214
+select compress(repeat('aaaaaaaaaa', 10000000)) is null;
+compress(repeat('aaaaaaaaaa', 10000000)) is null
+0

mysql-test/t/func_compress.test

@@ -41,4 +41,4 @@ drop table t1;
 #
 
 set @@max_allowed_packet=1048576*100;
-select length(compress(repeat('aaaaaaaaaa', 10000000)));
+select compress(repeat('aaaaaaaaaa', 10000000)) is null;