Merge 10.3 into 10.4

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 52641291eb2..7dd83d625e8 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1815,15 +1815,13 @@ 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;
+        if (table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_REPLACE))
+          goto err;
         table->move_fields(table->field, table->record[0], table->record[1]);
       }
       if (info->handle_duplicates == DUP_UPDATE)