diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
| commit | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (patch) | |
| tree | 650133297bec368a1cdeb50ea1950e1b4d1b679e /sql/item_timefunc.cc | |
| parent | b43494620f6cd57e8249940f4fb0406ffff8dff7 (diff) | |
| parent | b95ae56b9f47cc19d3498d4be3142b2449a04600 (diff) | |
| download | mariadb-git-f860b2aad41cd1b5ed0438ea211dcd78eec82b94.tar.gz | |
merge
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 633158ae06c..857d9bc2080 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2435,7 +2435,7 @@ bool Item_time_typecast::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) bool Item_date_typecast::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { - if (get_arg0_date(ltime, TIME_FUZZY_DATE)) + if (get_arg0_date(ltime, fuzzy_date & ~TIME_TIME_ONLY)) return 1; ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0; @@ -3145,7 +3145,7 @@ bool Item_func_str_to_date::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) bool Item_func_last_day::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { - if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE) || + if (get_arg0_date(ltime, fuzzy_date) || (ltime->month == 0)) return (null_value=1); uint month_idx= ltime->month-1; |