diff options
| author | ramil@mysql.com <> | 2005-06-24 14:04:48 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-06-24 14:04:48 +0500 |
| commit | b0e6db14c54a621bfcfafb3a65d87124e43c47aa (patch) | |
| tree | 19613a2227e058872e7909d41f5cb75e2be435cf /sql/item_timefunc.cc | |
| parent | 66330a9d59d57c1454a8361cb01df3f88ed6d5e8 (diff) | |
| download | mariadb-git-b0e6db14c54a621bfcfafb3a65d87124e43c47aa.tar.gz | |
backport for #10568: Function 'LAST_DAY(date)' does not return NULL for invalid argument.
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 a3cf69035f3..0e1a8766e8f 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2817,7 +2817,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]; |