diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:03:01 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:03:01 +0300 |
| commit | 509e4990af4d99e9d3c790eabe1c1705ae910b55 (patch) | |
| tree | 02d4ca9409711baef3ec163adc402f2c380df7c8 /sql/sql_insert.cc | |
| parent | 0cc811c633d1fe5290b10fa49fad0a4b889383fa (diff) | |
| parent | 4f143a88bcb36e94e9edba8a3c5b4a350dcd9bf9 (diff) | |
| download | mariadb-git-509e4990af4d99e9d3c790eabe1c1705ae910b55.tar.gz | |
Merge branch bb-10.3-release into bb-10.4-release
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 c969725bea4..820a305059f 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1820,9 +1820,10 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) 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) { |