summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergey Glukhov <sergey.glukhov@oracle.com>2011-07-27 12:34:25 +0400
committerSergey Glukhov <sergey.glukhov@oracle.com>2011-07-27 12:34:25 +0400
commit3050742dd9c81e5e18b64343dc7d3ea67650e050 (patch)
tree40f2c0fd56bc589c72aa98ba578d40ec75b322ef /sql
parent3a786df2d5570bdfed426c5922f0f172c8636586 (diff)
downloadmariadb-git-3050742dd9c81e5e18b64343dc7d3ea67650e050.tar.gz
Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0,
The problem is that TIME_FUZZY_DATE is explicitly used for get_arg0_date() function in Item_date_typecast::get_date method. The fix is to use real fuzzy_date value. mysql-test/r/func_time.result: test case mysql-test/t/func_time.test: test case sql/item_timefunc.cc: use real fuzzy_date value
Diffstat (limited to 'sql')
-rw-r--r--sql/item_timefunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 83b0b7cdebc..31474f1d6ca 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2646,7 +2646,7 @@ String *Item_time_typecast::val_str(String *str)
bool Item_date_typecast::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
{
- bool res= get_arg0_date(ltime, TIME_FUZZY_DATE);
+ bool res= get_arg0_date(ltime, fuzzy_date);
ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0;
ltime->time_type= MYSQL_TIMESTAMP_DATE;
return res;