diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-12 17:33:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-12 17:33:08 +0400 |
| commit | b59738a598569ace75be5e63b7ed6ca69afe6ebc (patch) | |
| tree | fe782f022937068aaab4d4b18171acc5d7533023 /sql/item.cc | |
| parent | b718dc449bfc6aa5756a316d4db8853918765619 (diff) | |
| parent | f1b4718ec894664df221704bb70fed80bdc14070 (diff) | |
| download | mariadb-git-b59738a598569ace75be5e63b7ed6ca69afe6ebc.tar.gz | |
Merge from 5.3
modified:
mysql-test/r/dyncol.result
mysql-test/r/type_time.result
mysql-test/t/dyncol.test
mysql-test/t/type_time.test
mysys/ma_dyncol.c
sql/item.cc
sql/item_func.cc
pending merges:
Alexander Barkov 2013-08-12 MDEV-4652 Wrong result for CONCAT(GREATEST(T...
sanja@montyprogr... 2013-08-01 MDEV-4811 Assertion `offset < 0x1f' f...
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 9862db4e597..bfc128a16ac 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; |