diff options
| author | unknown <sanja@montyprogram.com> | 2013-08-20 14:48:29 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-08-20 14:48:29 +0300 |
| commit | 35b2883643e337a8ec9c3cf7494363ae9889119c (patch) | |
| tree | eb2e7d833ed965b30f8b8485cfdac31abfea6c97 /sql/item.cc | |
| parent | dafa458262fb47a2c9534bcc36088b15e26307c2 (diff) | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| download | mariadb-git-35b2883643e337a8ec9c3cf7494363ae9889119c.tar.gz | |
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index f90469a66a7..d99f5ff46ea 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -297,7 +297,8 @@ String *Item::val_string_from_decimal(String *str) String *Item::val_string_from_date(String *str) { MYSQL_TIME ltime; - if (get_date(<ime, 0) || + if (get_date(<ime, + field_type() == MYSQL_TYPE_TIME ? TIME_TIME_ONLY : 0) || str->alloc(MAX_DATE_STRING_REP_LENGTH)) { null_value= 1; |