diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
| commit | 99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b (patch) | |
| tree | 121d54271137b00d58b23505644be3bc3a819a9e /sql/sql_base.cc | |
| parent | cda072bb4ba9e01d523d8deb995f28aa7a19fe11 (diff) | |
| parent | a736a3174a4e7c0d92a38901ae61f563d4afede7 (diff) | |
| download | mariadb-git-99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1e6bf3f0213..01e8a65fda4 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8799,6 +8799,8 @@ fill_record(THD *thd, TABLE *table, Field **ptr, List<Item> &values, if (!thd->is_error()) { thd->abort_on_warning= FALSE; + if (table->default_field && table->update_default_fields(ignore_errors)) + goto err; if (table->versioned()) table->vers_update_fields(); if (table->vfield && |