diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
| commit | a3073ecd96a829aaff87c6386e0766fc1440922b (patch) | |
| tree | d91e26efc46ab64ee6cb8de880eac060cded0213 /sql/item_timefunc.cc | |
| parent | 1a48919036a7746a15ff6bd19cb52c25fc6a57c1 (diff) | |
| parent | cbd52a42ee9b93675e5cdaa043df878c423b6571 (diff) | |
| download | mariadb-git-a3073ecd96a829aaff87c6386e0766fc1440922b.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 1002cf9fea8..eec8dde080c 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3030,7 +3030,7 @@ null_date: bool Item_func_last_day::get_date(MYSQL_TIME *ltime, uint fuzzy_date) { - if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE) || + if (get_arg0_date(ltime, fuzzy_date) || (ltime->month == 0)) { null_value= 1; |