database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-01-14 19:56:00 +02:00
parent 939d1255a7 20ca1bcf4b
commit 66744f4540
12 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@ -4149,7 +4149,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
Field::utype type= (Field::utype) MTYP_TYPENR(sql_field->unireg_check);
if (thd->variables.sql_mode & MODE_NO_ZERO_DATE &&
!sql_field->def &&
!sql_field->def && !sql_field->vcol_info &&
is_timestamp_type(sql_field->sql_type) &&
(sql_field->flags & NOT_NULL_FLAG) &&
(type == Field::NONE || type == Field::TIMESTAMP_UN_FIELD))