diff options
author | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-24 13:24:05 +0400 |
---|---|---|
committer | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-24 13:24:05 +0400 |
commit | c0badf88c6bdb685e8313e55ca2f721ba237e9ce (patch) | |
tree | e55f68f1430f8241de85d3bf1049c1cabdd62ce0 /sql/item_timefunc.cc | |
parent | 825c74f6aa5bdeb1d041846df3f592714dd741bb (diff) | |
parent | f8e924b467d099b5d99248c160a2aba59a6ea3ce (diff) | |
download | mariadb-git-c0badf88c6bdb685e8313e55ca2f721ba237e9ce.tar.gz |
Merging BUG#13458237 from 5.1.
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 6519146d040..97ba38aa5be 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2747,7 +2747,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, fuzzy_date); + bool res= get_arg0_date(ltime, TIME_FUZZY_DATE); ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0; ltime->time_type= MYSQL_TIMESTAMP_DATE; return res; |