diff options
| author | unknown <ramil@mysql.com> | 2005-06-06 10:39:21 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-06-06 10:39:21 +0500 |
| commit | d1e9ff363d4d5a79f6fbd5c19087ee5dfb27d4a9 (patch) | |
| tree | 57ed814008a590dd6dff13f0138deb29e996609d /sql/item_timefunc.cc | |
| parent | 5888d0396ebeb958d4168df2481345242baa674e (diff) | |
| parent | 44af4dbdf12f32ee5cb2be6d747c02b32912bf06 (diff) | |
| download | mariadb-git-d1e9ff363d4d5a79f6fbd5c19087ee5dfb27d4a9.tar.gz | |
Merge
sql/item_timefunc.cc:
Auto merged
mysql-test/r/func_time.result:
SCCS merged
mysql-test/t/func_time.test:
SCCS merged
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 76b0fa6afcf..b07de7eb21d 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3014,7 +3014,7 @@ String *Item_func_str_to_date::val_str(String *str) bool Item_func_last_day::get_date(TIME *ltime, uint fuzzy_date) { - if (get_arg0_date(ltime,fuzzy_date)) + if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE)) return 1; uint month_idx= ltime->month-1; ltime->day= days_in_month[month_idx]; |