diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2020-05-29 11:45:19 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2020-05-29 11:45:19 +0300 |
| commit | 57f7b4866f1347ebf3ee67fe61de3871e56e23cc (patch) | |
| tree | 458e73627087c589987e3b13f57f9ee288c02e24 /sql/sql_table.cc | |
| parent | 278facee7c7a028d642f3b5f23a42bcf099d86f3 (diff) | |
| download | mariadb-git-57f7b4866f1347ebf3ee67fe61de3871e56e23cc.tar.gz | |
MDEV-16937 Strict SQL with system versioned tables causes issues (10.4)
Respect system fields in NO_ZERO_DATE mode.
This is the subject for refactoring in MDEV-19597
Conflict resolution from 7d5223310789f967106d86ce193ef31b315ecff0
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 7c59c37734e..ff6c2873dfc 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4262,6 +4262,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, if (thd->variables.sql_mode & MODE_NO_ZERO_DATE && !sql_field->default_value && !sql_field->vcol_info && + !sql_field->vers_sys_field() && sql_field->is_timestamp_type() && !opt_explicit_defaults_for_timestamp && (sql_field->flags & NOT_NULL_FLAG) && |