diff options
author | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-10-23 13:55:06 +0500 |
---|---|---|
committer | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-10-23 13:55:06 +0500 |
commit | c7528dff69cfb8dd3bf9b004b41f1b4a6252da77 (patch) | |
tree | 158a09f7b6208e5c6d6ab5d5c2415de29f3bbed6 /sql/item_strfunc.h | |
parent | 5a42bb96f86906319ab20247112b31cf8be66fc1 (diff) | |
parent | b4f558419ff3b603fbd29adfa085f2d2c8f4b379 (diff) | |
download | mariadb-git-c7528dff69cfb8dd3bf9b004b41f1b4a6252da77.tar.gz |
Merge mysql.com:/home/ram/work/b31349/b31349.5.0
into mysql.com:/home/ram/work/b31349/b31349.5.1
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 155f8457156..2322f0aacc2 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -657,7 +657,12 @@ 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 |