Commit 04be401f authored by unknown's avatar unknown
Browse files

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

into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
parents 5f3c9108 5c87b55f

mysql-test/r/func_compress.result

+7 −0
Original line number Diff line number Diff line
@@ -72,3 +72,10 @@ set @@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

create table t1(a blob);

insert into t1 values(NULL), (compress('a'));

select uncompress(a), uncompressed_length(a) from t1;

uncompress(a)	uncompressed_length(a)

NULL	NULL

a	1

drop table t1;

mysql-test/t/func_compress.test

+9 −0
Original line number Diff line number Diff line
@@ -45,4 +45,13 @@ set @@max_allowed_packet=1048576*100; 
--replace_result "''" XXX "'1'" XXX

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



#

# Bug #18643: problem with null values

#



create table t1(a blob);

insert into t1 values(NULL), (compress('a'));

select uncompress(a), uncompressed_length(a) from t1;

drop table t1;



# End of 4.1 tests

sql/item_strfunc.cc

+1 −0
Original line number Diff line number Diff line
@@ -2850,6 +2850,7 @@ String *Item_func_uncompress::val_str(String *str) 


  if (!res)

    goto err;

  null_value= 0;

  if (res->is_empty())

    return res;