diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-23 13:55:06 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-23 13:55:06 +0500 |
| commit | 6e71a0f99b6a8d77ef6886734ce139d5d3b66404 (patch) | |
| tree | 158a09f7b6208e5c6d6ab5d5c2415de29f3bbed6 /sql/item_strfunc.h | |
| parent | 531193dc422b0f5a05ded78b2db1655cdd460528 (diff) | |
| parent | 426b551bf600e4c2d0a78227fe51dc009d0231c7 (diff) | |
| download | mariadb-git-6e71a0f99b6a8d77ef6886734ce139d5d3b66404.tar.gz | |
Merge mysql.com:/home/ram/work/b31349/b31349.5.0
into mysql.com:/home/ram/work/b31349/b31349.5.1
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item_strfunc.h:
Auto merged
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 |