diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 19:07:03 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 19:07:03 +0400 |
| commit | 2a0f4e4faf8e0f48f25a39775aa4d34b13f43310 (patch) | |
| tree | e4e5ec844499b10c41d5990c1e2a469e4a6540e8 /sql | |
| parent | b603746f142d979edff14e79c93288882d8e8b00 (diff) | |
| parent | 462a6f7d1a88297df119cbf5a055716288c2fa6a (diff) | |
| download | mariadb-git-2a0f4e4faf8e0f48f25a39775aa4d34b13f43310.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/31758/my50-31758
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 04d1997e879..7607ebfc761 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -584,7 +584,8 @@ public: void fix_length_and_dec() { collation.set(default_charset()); - max_length= 64; + max_length=64; + maybe_null= 1; } }; @@ -682,7 +683,7 @@ public: } String* val_str(String* str); const char *func_name() const { return "inet_ntoa"; } - void fix_length_and_dec() { decimals = 0; max_length=3*8+7; } + void fix_length_and_dec() { decimals = 0; max_length=3*8+7; maybe_null=1;} }; class Item_func_quote :public Item_str_func |