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/field.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/field.cc')
| -rw-r--r-- | sql/field.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 0a8fdc3d3f5..a7cfca6d819 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -11265,6 +11265,13 @@ bool Field::save_in_field_default_value(bool view_error_processing) { THD *thd= table->in_use; + /* + TODO: MDEV-19597 Refactor TABLE::vers_update_fields() via stored virtual columns + This condition will go away as well as other conditions with vers_sys_field(). + */ + if (vers_sys_field()) + return false; + if (unlikely(flags & NO_DEFAULT_VALUE_FLAG && real_type() != MYSQL_TYPE_ENUM)) { |