diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
| commit | 961c7938bb4df7a19ccd8def1e57669f7600d3e5 (patch) | |
| tree | b3d208be6d95ea3e4d1ba81c78392517ffe8f7fd /sql/sql_update.cc | |
| parent | 5adcb2e7b8f08cc459e478e5b118d924fbe18c86 (diff) | |
| parent | 3467f6376472ce695e36746ba5b3c13cb5fcbb9f (diff) | |
| download | mariadb-git-961c7938bb4df7a19ccd8def1e57669f7600d3e5.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 49d73657689..4424d7b5572 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2601,7 +2601,7 @@ error: if (has_vers_fields && table->versioned(VERS_TIMESTAMP)) { store_record(table, record[2]); - if (vers_insert_history_row(table)) + if (unlikely(error= vers_insert_history_row(table))) { restore_record(table, record[2]); goto error; |