diff options
| author | unknown <kostja@bodhi.local> | 2006-08-14 16:30:57 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-14 16:30:57 +0400 |
| commit | 021cea21fdbfe50db647fe2ab3606f1e075c0654 (patch) | |
| tree | 213e7c7f15ac23c498fb6ddc5dd3d27425757f43 /sql/item_strfunc.h | |
| parent | 2f48a59124c776c36ea6609f31543bf6c5f8ed86 (diff) | |
| parent | 675a5b776d693b64d72227dea86f51cb9ca31781 (diff) | |
| download | mariadb-git-021cea21fdbfe50db647fe2ab3606f1e075c0654.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/sql_db.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
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 e085c0b4d7b..1b843b27203 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -831,7 +831,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 bool check_partition_func_processor(byte *bool_arg) { return 0;} |