diff options
| author | serg@serg.mylan <> | 2003-10-12 15:16:45 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-10-12 15:16:45 +0200 |
| commit | 32fed1e8774fa16e15f13e61f6594cdd69a2faa1 (patch) | |
| tree | b2e6caac84f47ab3a2646ad476043f5d6e6fdde5 /sql/item_strfunc.cc | |
| parent | 54533936b1f0c03ad73a3b47f8c4fa5fb48b4178 (diff) | |
| download | mariadb-git-32fed1e8774fa16e15f13e61f6594cdd69a2faa1.tar.gz | |
wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.
typo in error message text corrected.
new tests added
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; } |