diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:17:20 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:57:11 +0300 |
| commit | 3f55c569514679d98e09e71286ca28a8ac667a71 (patch) | |
| tree | 4347fbb2238d1a97e5e1166f9e7b7b7adba165ce /sql/sql_insert.cc | |
| parent | ca1dc0789b7e724128d1369977e2f70fb9d69bb5 (diff) | |
| parent | a4139f8d68bd31e80ff6202c093cd232c194ddfd (diff) | |
| download | mariadb-git-mariadb-10.5.10.tar.gz | |
Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 9379421e8cd..ab2c479af5c 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1868,9 +1868,10 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, select_result *sink) in handler methods for the just read row in record[1]. */ table->move_fields(table->field, table->record[1], table->record[0]); - if (table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_REPLACE)) - goto err; + int verr = table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_REPLACE); table->move_fields(table->field, table->record[0], table->record[1]); + if (verr) + goto err; } if (info->handle_duplicates == DUP_UPDATE) { |