diff options
| author | unknown <serg@serg.mylan> | 2003-10-12 15:16:45 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-12 15:16:45 +0200 |
| commit | 1862f671606e086c68228903abb64d9727f95b72 (patch) | |
| tree | b2e6caac84f47ab3a2646ad476043f5d6e6fdde5 /sql/item_strfunc.cc | |
| parent | b297e76402bc8819d6e7c7765f380a764205388d (diff) | |
| download | mariadb-git-1862f671606e086c68228903abb64d9727f95b72.tar.gz | |
wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.
typo in error message text corrected.
new tests added
mysql-test/r/func_compress.result:
new tests added
mysql-test/t/func_compress.test:
new tests added
sql/item_strfunc.cc:
max size of uncompressed data is max_allowed_packet not 8K
sql/share/czech/errmsg.txt:
typo fixed
sql/share/danish/errmsg.txt:
typo fixed
sql/share/dutch/errmsg.txt:
typo fixed
sql/share/english/errmsg.txt:
typo fixed
sql/share/estonian/errmsg.txt:
typo fixed
sql/share/french/errmsg.txt:
typo fixed
sql/share/german/errmsg.txt:
typo fixed
sql/share/greek/errmsg.txt:
typo fixed
sql/share/hungarian/errmsg.txt:
typo fixed
sql/share/italian/errmsg.txt:
typo fixed
sql/share/japanese/errmsg.txt:
typo fixed
sql/share/korean/errmsg.txt:
typo fixed
sql/share/norwegian-ny/errmsg.txt:
typo fixed
sql/share/norwegian/errmsg.txt:
typo fixed
sql/share/polish/errmsg.txt:
typo fixed
sql/share/portuguese/errmsg.txt:
typo fixed
sql/share/romanian/errmsg.txt:
typo fixed
sql/share/russian/errmsg.txt:
typo fixed
sql/share/serbian/errmsg.txt:
typo fixed
sql/share/slovak/errmsg.txt:
typo fixed
sql/share/spanish/errmsg.txt:
typo fixed
sql/share/swedish/errmsg.txt:
typo fixed
sql/share/ukrainian/errmsg.txt:
typo fixed
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index c8ee64dc707..55a20908894 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2609,11 +2609,12 @@ String *Item_func_uncompress::val_str(String *str) int err= Z_OK; uint code; - if (new_size > MAX_BLOB_WIDTH) + if (new_size > current_thd->variables.max_allowed_packet) { push_warning_printf(current_thd,MYSQL_ERROR::WARN_LEVEL_ERROR, ER_TOO_BIG_FOR_UNCOMPRESS, - ER(ER_TOO_BIG_FOR_UNCOMPRESS),MAX_BLOB_WIDTH); + ER(ER_TOO_BIG_FOR_UNCOMPRESS), + current_thd->variables.max_allowed_packet); null_value= 0; return 0; } |