diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-14 19:56:00 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-14 19:59:34 +0200 |
| commit | 66744f4540c464413055a79111c34449e8381618 (patch) | |
| tree | 0905a1b2e47efb1dcd3dde1c9d5187fa45e780dc /sql/sql_table.cc | |
| parent | 939d1255a78e374f468154f3353e5faa0fa517ca (diff) | |
| parent | 20ca1bcf4bd81ed43683676276b5f27dc8da8e91 (diff) | |
| download | mariadb-git-66744f4540c464413055a79111c34449e8381618.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 5b5fa27ac7e..5fde13c1f88 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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)) |