diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-03 09:46:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-03 09:46:20 +0200 |
| commit | 78cc6db44a9f1344dd5c00cf4f3cdde158fe108e (patch) | |
| tree | 3f6ad0e92adf22f242be974da029d4194dec2cf2 /sql/item_cmpfunc.cc | |
| parent | cfae3065d7ed5b7c5aa35596933d9f234f221878 (diff) | |
| download | mariadb-git-78cc6db44a9f1344dd5c00cf4f3cdde158fe108e.tar.gz | |
MDEV-4667 DATE('string') incompability between mysql and mariadb
Cleanup: remove TIME_FUZZY_DATE.
Introduce TIME_FUZZY_DATES which means "very fuzzy, the resulting
value is only used for comparison. It can be invalid date, fine, as long as it can be
compared".
Updated many tests results (they're better now).
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 1aaedf3a6ad..b2a91c8ec1e 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -713,7 +713,7 @@ bool get_mysql_time_from_str(THD *thd, String *str, timestamp_type warn_type, bool value; int error; enum_mysql_timestamp_type timestamp_type; - int flags= TIME_FUZZY_DATE | MODE_INVALID_DATES; + int flags= TIME_FUZZY_DATES | MODE_INVALID_DATES; if (warn_type == MYSQL_TIMESTAMP_TIME) flags|= TIME_TIME_ONLY; @@ -885,7 +885,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg, else { MYSQL_TIME ltime; - uint fuzzydate= TIME_FUZZY_DATE | TIME_INVALID_DATES; + uint fuzzydate= TIME_FUZZY_DATES | TIME_INVALID_DATES; if (f_type == MYSQL_TYPE_TIME) fuzzydate|= TIME_TIME_ONLY; if (item->get_date(<ime, fuzzydate)) |