diff options
| author | mikael/pappa@dator5.(none) <> | 2006-08-26 06:18:41 -0400 |
|---|---|---|
| committer | mikael/pappa@dator5.(none) <> | 2006-08-26 06:18:41 -0400 |
| commit | 3b9f4a616c32097d0c7187e7b07e83a48e4d2492 (patch) | |
| tree | 38cb220000cc38bd61f36ae6e3f0e1dbf145ef9a /sql/item_strfunc.h | |
| parent | 9711ee848c85152227338ef578cad226e28f36fb (diff) | |
| parent | 257ce16d58c5f375ca026cf05f97d5ded77851eb (diff) | |
| download | mariadb-git-3b9f4a616c32097d0c7187e7b07e83a48e4d2492.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug18198
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 615ad4b9aa3..f23f35c3830 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -822,7 +822,7 @@ class Item_func_uncompress: public Item_str_func String buffer; public: Item_func_uncompress(Item *a): Item_str_func(a){} - void fix_length_and_dec(){max_length= MAX_BLOB_WIDTH;} + void fix_length_and_dec(){ maybe_null= 1; max_length= MAX_BLOB_WIDTH; } const char *func_name() const{return "uncompress";} String *val_str(String *) ZLIB_DEPENDED_FUNCTION }; |