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_timefunc.cc | |
| parent | dafa458262fb47a2c9534bcc36088b15e26307c2 (diff) | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| download | mariadb-git-35b2883643e337a8ec9c3cf7494363ae9889119c.tar.gz | |
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e777ecf121e..c82fb3dd0f2 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2032,7 +2032,9 @@ bool Item_date_add_interval::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { INTERVAL interval; - if (args[0]->get_date(ltime, 0) || + if (args[0]->get_date(ltime, + cached_field_type == MYSQL_TYPE_TIME ? + TIME_TIME_ONLY : 0) || get_interval_value(args[1], int_type, &interval)) return (null_value=1); @@ -2423,7 +2425,9 @@ bool Item_time_typecast::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) if (ltime->time_type != MYSQL_TIMESTAMP_TIME) ltime->year= ltime->month= ltime->day= 0; ltime->time_type= MYSQL_TIMESTAMP_TIME; - return 0; + return (fuzzy_date & TIME_TIME_ONLY) ? 0 : + (null_value= check_date_with_warn(ltime, fuzzy_date, + MYSQL_TIMESTAMP_ERROR)); } |