diff options
author | Igor Babaev <igor@askmonty.org> | 2012-09-08 22:36:55 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2012-09-08 22:36:55 -0700 |
commit | 8c131f1262099d4088f3c83642bd09cd83aab148 (patch) | |
tree | 9d8351d4eb6bc7603b5225016747078038d506aa /sql/field.cc | |
parent | 92eadf641590560cbc29ece9c37c7ed493a89468 (diff) | |
parent | 22de18ddcb97640f8f90c1c88d1dcd795ba1070f (diff) | |
download | mariadb-git-8c131f1262099d4088f3c83642bd09cd83aab148.tar.gz |
Merge 5.5 -> mwl248
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 610d56ce37a..db3854aa340 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5710,7 +5710,7 @@ bool Field_newdate::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate) if (!tmp) return fuzzydate & TIME_NO_ZERO_DATE; if (!ltime->month || !ltime->day) - return !(fuzzydate & TIME_FUZZY_DATE); + return fuzzydate & TIME_NO_ZERO_IN_DATE; return 0; } |