summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2014-07-23 13:38:48 +0400
committerAlexander Barkov <bar@mariadb.org>2014-07-23 13:38:48 +0400
commit80708da138913deb3a096da0e761ff247766bf96 (patch)
tree330142191d544dc14189d5000c313ebf5b706ec6 /sql
parent30b007a1ab5dd950fe451d78c29805f09cc0b98f (diff)
downloadmariadb-git-80708da138913deb3a096da0e761ff247766bf96.tar.gz
MDEV-5750 Assertion `ltime->year == 0' fails on a query with EXTRACT DAY_MINUTE and TIME column
Item_func_min_max::get_date() did not clear ltime->year when returning a TIME value.
Diffstat (limited to 'sql')
-rw-r--r--sql/item_func.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index fc69fa711c2..8df0564af15 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2646,7 +2646,7 @@ bool Item_func_min_max::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
{
ltime->time_type= MYSQL_TIMESTAMP_TIME;
ltime->hour+= (ltime->month * 32 + ltime->day) * 24;
- ltime->month= ltime->day= 0;
+ ltime->year= ltime->month= ltime->day= 0;
if (adjust_time_range_with_warn(ltime,
min(decimals, TIME_SECOND_PART_DIGITS)))
return (null_value= true);