diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 11:02:07 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 11:02:07 +0200 |
| commit | 3467f6376472ce695e36746ba5b3c13cb5fcbb9f (patch) | |
| tree | 31432a470ddb2247e0a3e2bcadd89666e273d904 /sql/sql_update.cc | |
| parent | ce141d0714207afb70911abce21c2a4055b8a9e9 (diff) | |
| parent | eaeb8ec4b87882711ecb8e1c7476a6e410d5d2a9 (diff) | |
| download | mariadb-git-3467f6376472ce695e36746ba5b3c13cb5fcbb9f.tar.gz | |
Merge 10.3 into 10.4
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 e8a9bd771f7..7230c9c5f60 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2599,7 +2599,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; |