diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-26 06:18:41 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-26 06:18:41 -0400 |
| commit | b300d5602d45e1944988fc14fbfb323956dd53c7 (patch) | |
| tree | 38cb220000cc38bd61f36ae6e3f0e1dbf145ef9a /sql/item_strfunc.h | |
| parent | d7c7f5a95dd016d273b10cefa3eeb75237e78770 (diff) | |
| parent | 43dbfa66c5cf2c777af7c70eb121c4749e9a30aa (diff) | |
| download | mariadb-git-b300d5602d45e1944988fc14fbfb323956dd53c7.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug18198
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 }; |