summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-12 09:22:11 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-12 11:30:50 +0300
commit8ee4b414ae071b1c666b97bac1808bc67a260e78 (patch)
tree04be2772042506a6b2f76b67401bddacc06734dd /storage/innobase
parentea876b39f33af6b7d54f2a0a5def0fbf40b30e27 (diff)
downloadmariadb-git-8ee4b414ae071b1c666b97bac1808bc67a260e78.tar.gz
Relax a too strict debug assertion for Mariabackup --prepare
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/trx/trx0trx.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index ac23234179c..2408e4bdaf4 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -619,6 +619,7 @@ trx_free_prepared(
|| (trx_state_eq(trx, TRX_STATE_ACTIVE)
&& trx->is_recovered
&& (!srv_was_started
+ || srv_operation == SRV_OPERATION_RESTORE
|| srv_read_only_mode
|| srv_force_recovery >= SRV_FORCE_NO_TRX_UNDO)));
ut_a(trx->magic_n == TRX_MAGIC_N);