Commit 323284d5 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 8f60d95c 1a7783e0

mysql-test/r/func_compress.result

+2 −2
Original line number Diff line number Diff line
@@ -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 compress(repeat('aaaaaaaaaa', 10000000)) is null;

compress(repeat('aaaaaaaaaa', 10000000)) is null

select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;

compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null

0

mysql-test/t/func_compress.test

+4 −1
Original line number Diff line number Diff line
@@ -38,7 +38,10 @@ drop table t1; 


#

# Bug #5497: a problem with large strings

# note that when LOW_MEMORY is set the "test" below is meaningless

#



set @@max_allowed_packet=1048576*100;

select compress(repeat('aaaaaaaaaa', 10000000)) is null;
 
--replace_result "''" XXX "'1'" XXX

eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;