summaryrefslogtreecommitdiff
path: root/storage/xtradb/trx
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-11-09 14:37:03 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-11-09 14:37:03 +0200
commitd2ffafe00f7e4c2246bb0b45bd407ff179163c5e (patch)
treeff195ef25f616dd5f8262721e05db6b058bbbfae /storage/xtradb/trx
parent0fdb0bdf2769dc4e69d46b342200d3fd333fa3a5 (diff)
downloadmariadb-git-d2ffafe00f7e4c2246bb0b45bd407ff179163c5e.tar.gz
MDEV-14333 Mariabackup --apply-log-only crashes if incomplete transactions with update_undo logs are present
trx_undo_free_prepared(): Relax the assertion for mariabackup --apply-log-only.
Diffstat (limited to 'storage/xtradb/trx')
-rw-r--r--storage/xtradb/trx/trx0undo.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/xtradb/trx/trx0undo.cc b/storage/xtradb/trx/trx0undo.cc
index 0cc3048e624..3259bcb70b1 100644
--- a/storage/xtradb/trx/trx0undo.cc
+++ b/storage/xtradb/trx/trx0undo.cc
@@ -2025,6 +2025,7 @@ trx_undo_free_prepared(
/* lock_trx_release_locks() assigns
trx->is_recovered=false */
ut_a(srv_read_only_mode
+ || srv_apply_log_only
|| srv_force_recovery >= SRV_FORCE_NO_TRX_UNDO);
break;
default: