diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-05-11 14:05:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-05-11 14:05:52 +0300 |
| commit | cd5ca0b11882cfa8eafa8c687ed3084423bc7e52 (patch) | |
| tree | 92045e255e18d9acbe7cd8385c64c9f1830db257 /sql/sql_insert.cc | |
| parent | 78a1264cfae37667a2812c5bb5cc6638d9eed5ff (diff) | |
| parent | c271057288f71746d1816824f338f2d9c47f67c1 (diff) | |
| download | mariadb-git-bb-10.6-MDEV-29911.tar.gz | |
Merge 10.6bb-10.6-MDEV-29911
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c891ff8d650..22374458c3d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2223,7 +2223,7 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, TABLE_LIST *t for (Field **field=entry->field ; *field ; field++) { if (!bitmap_is_set(write_set, (*field)->field_index) && - !(*field)->vers_sys_field() && + !(*field)->vers_sys_field() && !(*field)->vcol_info && has_no_default_value(thd, *field, table_list) && ((*field)->real_type() != MYSQL_TYPE_ENUM)) err=1; @@ -4159,6 +4159,7 @@ bool select_insert::store_values(List<Item> &values) DBUG_ENTER("select_insert::store_values"); bool error; + table->reset_default_fields(); if (fields->elements) error= fill_record_n_invoke_before_triggers(thd, table, *fields, values, true, TRG_EVENT_INSERT); |