diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-21 16:36:47 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-21 16:36:47 +0300 |
commit | b1538f4d60bf30de00417a7c3f948d2de654fcb3 (patch) | |
tree | 9690f28c9dbdcb5554c9762c81153f37571aa697 /sql/sql_insert.cc | |
parent | fc48c8ff4c6cb9aa7a0fd27e724e6e3acd555b0e (diff) | |
parent | b75563cdfd161e373480949ffa498bd4a8087b12 (diff) | |
download | mariadb-git-b1538f4d60bf30de00417a7c3f948d2de654fcb3.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 807dd94c6f0..8d0e08d8c8c 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1682,6 +1682,10 @@ int vers_insert_history_row(TABLE *table) if (row_start->cmp(row_start->ptr, row_end->ptr) >= 0) return 0; + if (table->vfield && + table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_READ)) + return HA_ERR_GENERIC; + return table->file->ha_write_row(table->record[0]); } |