diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
| commit | a2bcee626d4ef2836e38e4932305871390164644 (patch) | |
| tree | b41e357427318bad8985078b91bbd2b0360defc8 /sql/sql_time.cc | |
| parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_time.cc')
| -rw-r--r-- | sql/sql_time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index 9785a1691af..eddf14bfbf3 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -1359,7 +1359,7 @@ time_to_datetime_with_warn(THD *thd, only in the old mode. */ if (time_to_datetime(thd, from, to) || - ((thd->variables.old_behavior && OLD_MODE_ZERO_DATE_TIME_CAST) && + ((thd->variables.old_behavior & OLD_MODE_ZERO_DATE_TIME_CAST) && check_date(to, fuzzydate, &warn))) { ErrConvTime str(from); |