Relax a too strict debug assertion for Mariabackup --prepare

8ee4b414 · Marko Mäkelä · ea876b39 · 8ee4b414
Commit 8ee4b414 authored Sep 12, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

storage/innobase/trx/trx0trx.cc storage/innobase/trx/trx0trx.cc +1 -0

No files found.
--- 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);