diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
| commit | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (patch) | |
| tree | 31068acc0b39c208d35d524688a5985831af0447 /sql/item_create.cc | |
| parent | 8a23ae088dc38f591efeab9eccdef5eb9094add9 (diff) | |
| parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
| download | mariadb-git-5f6380adde2dac3f32b40339b9b702c0135eb7d6.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index c6d0f09907b..ba1ce2b0d3b 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -5841,11 +5841,10 @@ Item *create_temporal_literal(THD *thd, MYSQL_TIME_STATUS status; MYSQL_TIME ltime; Item *item= NULL; - ulonglong datetime_flags= thd->variables.sql_mode & + ulonglong flags= thd->variables.sql_mode & (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | MODE_INVALID_DATES); - ulonglong flags= TIME_FUZZY_DATE | datetime_flags; switch(type) { |