diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-08 12:58:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-08 12:58:28 +0400 |
| commit | e9db0da787996c1244f579bbc313c82ecde95d2f (patch) | |
| tree | a8be25cabdcde130e304333906a8b558c2fba43e /sql/item_timefunc.cc | |
| parent | e6a6f653a9c67741f67df9448b3182066939283c (diff) | |
| download | mariadb-git-e9db0da787996c1244f579bbc313c82ecde95d2f.tar.gz | |
MDEV-4653 Wrong result for CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5')
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 3322863a76d..d89cd01d26a 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1923,7 +1923,9 @@ bool Item_date_add_interval::get_date(MYSQL_TIME *ltime, uint 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, &value, &interval)) return (null_value=1); @@ -2301,7 +2303,9 @@ bool Item_time_typecast::get_date(MYSQL_TIME *ltime, uint 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)); } |