Commit beb5d60a authored by ram@gw.mysql.r18.ru's avatar ram@gw.mysql.r18.ru

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

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5497
parents 19a5d67e a3a6b7fa
...@@ -68,3 +68,7 @@ Warnings: ...@@ -68,3 +68,7 @@ Warnings:
Error 1259 ZLIB: Input data corrupted 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) Error 1256 Uncompressed data size too large; the maximum size is 1048576 (probably, length of uncompressed data was corrupted)
drop table t1; drop table t1;
set @@max_allowed_packet=1048576*100;
select length(compress(repeat('aaaaaaaaaa', 10000000)));
length(compress(repeat('aaaaaaaaaa', 10000000)))
97214
...@@ -35,3 +35,10 @@ select length(a) from t1; ...@@ -35,3 +35,10 @@ select length(a) from t1;
select length(uncompress(a)) from t1; select length(uncompress(a)) from t1;
drop table t1; drop table t1;
#
# Bug #5497: a problem with large strings
#
set @@max_allowed_packet=1048576*100;
select length(compress(repeat('aaaaaaaaaa', 10000000)));
...@@ -2731,11 +2731,17 @@ String *Item_func_compress::val_str(String *str) ...@@ -2731,11 +2731,17 @@ String *Item_func_compress::val_str(String *str)
compress(compress(compress(...))) compress(compress(compress(...)))
I.e. zlib give number 'at least'.. I.e. zlib give number 'at least'..
*/ */
ulong new_size= (ulong)((res->length()*120)/100)+12; ulong new_size= res->length() + res->length() / 5 + 12;
buffer.realloc((uint32)new_size + 4 + 1); // Will check new_size overflow: new_size <= res->length()
Byte *body= ((Byte*)buffer.ptr()) + 4; if (((uint32) new_size <= res->length()) ||
buffer.realloc((uint32) new_size + 4 + 1))
{
null_value= 1;
return 0;
}
Byte *body= ((Byte*)buffer.ptr()) + 4;
// As far as we have checked res->is_empty() we can use ptr() // As far as we have checked res->is_empty() we can use ptr()
if ((err= compress(body, &new_size, if ((err= compress(body, &new_size,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment