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/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/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index d90099835c0..92dfa59e648 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -8686,7 +8686,7 @@ bool TABLE::validate_default_values_of_unset_fields(THD *thd) const for (Field **fld= field; *fld; fld++) { if (!bitmap_is_set(write_set, (*fld)->field_index) && - !((*fld)->flags & NO_DEFAULT_VALUE_FLAG)) + !((*fld)->flags & (NO_DEFAULT_VALUE_FLAG | VERS_SYSTEM_FIELD))) { if (!(*fld)->is_null_in_record(s->default_values) && (*fld)->validate_value_in_record_with_warn(thd, s->default_values) && |