diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
| commit | 192aa295b4bc877d0fed24154c57304c3f789179 (patch) | |
| tree | 893239effa9f3c9a7d00b324de9b4e41c63bdb4d /sql/sql_insert.cc | |
| parent | 03f3ba2dcb07a672f9c1d87489b9ec88af62a96f (diff) | |
| parent | 8acbf9c1f961aa1008ef509e059e1a09943f5ed3 (diff) | |
| download | mariadb-git-192aa295b4bc877d0fed24154c57304c3f789179.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1f3a70721fc..a64c120f14c 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1786,12 +1786,15 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) } if (table->vfield) { + my_bool abort_on_warning= thd->abort_on_warning; /* We have not yet called update_virtual_fields(VOL_UPDATE_FOR_READ) in handler methods for the just read row in record[1]. */ table->move_fields(table->field, table->record[1], table->record[0]); + thd->abort_on_warning= 0; table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_REPLACE); + thd->abort_on_warning= abort_on_warning; table->move_fields(table->field, table->record[0], table->record[1]); } if (info->handle_duplicates == DUP_UPDATE) |