diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 18:27:17 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 18:27:17 +0400 |
| commit | c98b7fe5b7bc274acf5f4e71241e0035a21d19c0 (patch) | |
| tree | a8b54c7bae40f9800e33bf1d3d9b3452f9af87e1 /sql/item_strfunc.h | |
| parent | f97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff) | |
| parent | 462a6f7d1a88297df119cbf5a055716288c2fa6a (diff) | |
| download | mariadb-git-c98b7fe5b7bc274acf5f4e71241e0035a21d19c0.tar.gz | |
Merge mysql.com:/home/hf/work/31758/my50-31758
into mysql.com:/home/hf/work/31758/my51-31758
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.h:
Auto merged
mysql-test/r/func_str.result:
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 1a264fa2c01..3608568bd5e 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -558,7 +558,8 @@ public: void fix_length_and_dec() { collation.set(default_charset()); - max_length= 64; + max_length=64; + maybe_null= 1; } }; @@ -656,7 +657,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 |