diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 18:12:42 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 18:12:42 +0400 |
| commit | 62617b09c3ffd2fbd512f6a038dfa20a37df4c3b (patch) | |
| tree | ae24652ad56bfe7d209902f423129f66134466e8 /sql/item_strfunc.h | |
| parent | 9e6bb07d3845566ffa7274bb14df544c8147f594 (diff) | |
| parent | e722393f519400c2f14999cbc669cafea648aa9e (diff) | |
| download | mariadb-git-62617b09c3ffd2fbd512f6a038dfa20a37df4c3b.tar.gz | |
Merge mysql.com:/home/hf/work/31758/my41-31758
into mysql.com:/home/hf/work/31758/my50-31758
mysql-test/t/func_str.test:
Auto merged
mysql-test/r/func_str.result:
merging
sql/item_strfunc.h:
merging
Diffstat (limited to 'sql/item_strfunc.h')
| -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 |