diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-07 21:05:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-07 21:05:28 +0100 |
| commit | 12f54d7de0c641c16299808d7835ad34192cd601 (patch) | |
| tree | 13ffd5ca13a64abedc6b4fce3a0e587adaf0620d /sql/item.cc | |
| parent | 68916bcab383a25a8f9eb2ae60bb8435b52e5094 (diff) | |
| download | mariadb-git-12f54d7de0c641c16299808d7835ad34192cd601.tar.gz | |
@@old_mode=zero_date_time_cast
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 1c81fda9c63..0fbd58567ef 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -248,7 +248,8 @@ bool Item::get_date_with_conversion(MYSQL_TIME *ltime, ulonglong fuzzydate) and leave it to get_date() to check date. */ ulonglong time_flag= (field_type() == MYSQL_TYPE_TIME && - !current_thd->variables.old_mode) ? TIME_TIME_ONLY : 0; + !(current_thd->variables.old_behavior & OLD_MODE_ZERO_DATE_TIME_CAST)) ? + TIME_TIME_ONLY : 0; if (get_date(ltime, fuzzydate | time_flag)) return true; if (ltime->time_type == MYSQL_TIMESTAMP_TIME && |