Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a3a6b7fa
Commit
a3a6b7fa
authored
Sep 13, 2004
by
ram@gw.mysql.r18.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A fix (bug #5497: COMPRESS() returns NULL for large strings).
parent
ca0fc0b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
mysql-test/r/func_compress.result
mysql-test/r/func_compress.result
+4
-0
mysql-test/t/func_compress.test
mysql-test/t/func_compress.test
+7
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+9
-3
No files found.
mysql-test/r/func_compress.result
View file @
a3a6b7fa
...
...
@@ -68,3 +68,7 @@ Warnings:
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
mysql-test/t/func_compress.test
View file @
a3a6b7fa
...
...
@@ -35,3 +35,10 @@ select length(a) from t1;
select
length
(
uncompress
(
a
))
from
t1
;
drop
table
t1
;
#
# Bug #5497: a problem with large strings
#
set
@@
max_allowed_packet
=
1048576
*
100
;
select
length
(
compress
(
repeat
(
'aaaaaaaaaa'
,
10000000
)));
sql/item_strfunc.cc
View file @
a3a6b7fa
...
...
@@ -2723,11 +2723,17 @@ String *Item_func_compress::val_str(String *str)
compress(compress(compress(...)))
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
);
Byte
*
body
=
((
Byte
*
)
buffer
.
ptr
())
+
4
;
// Will check new_size overflow: new_size <= res->length()
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()
if
((
err
=
compress
(
body
,
&
new_size
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment