mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
This commit is contained in:
commit
c5219d0d67
3 changed files with 17 additions and 0 deletions
|
@ -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;
|
||||
|
|
|
@ -47,4 +47,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
|
||||
|
|
|
@ -2941,6 +2941,7 @@ String *Item_func_uncompress::val_str(String *str)
|
|||
|
||||
if (!res)
|
||||
goto err;
|
||||
null_value= 0;
|
||||
if (res->is_empty())
|
||||
return res;
|
||||
|
||||
|
|
Loading…
Reference in a new issue