Commit b94a62b5 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-13890 mariabackup.xb_compressed_encrypted failed in buildbot, InnoDB: assertion failure

The assertion failure was relaxed in
commit 02ba15a9
but it was not enough, because another assertion would fail.

trx_undo_free_prepared(): Allow any undo log state. For transactions
that were resurrected in TRX_STATE_COMMITTED_IN_MEMORY
the undo log state would have been reset by trx_undo_set_state_at_finish().
parent f29cfa1d
......@@ -1818,6 +1818,12 @@ trx_undo_free_prepared(
switch (trx->rsegs.m_redo.update_undo->state) {
case TRX_UNDO_PREPARED:
break;
case TRX_UNDO_CACHED:
case TRX_UNDO_TO_FREE:
case TRX_UNDO_TO_PURGE:
ut_ad(trx_state_eq(trx,
TRX_STATE_COMMITTED_IN_MEMORY));
/* fall through */
case TRX_UNDO_ACTIVE:
/* lock_trx_release_locks() assigns
trx->is_recovered=false */
......@@ -1840,6 +1846,12 @@ trx_undo_free_prepared(
switch (trx->rsegs.m_redo.insert_undo->state) {
case TRX_UNDO_PREPARED:
break;
case TRX_UNDO_CACHED:
case TRX_UNDO_TO_FREE:
case TRX_UNDO_TO_PURGE:
ut_ad(trx_state_eq(trx,
TRX_STATE_COMMITTED_IN_MEMORY));
/* fall through */
case TRX_UNDO_ACTIVE:
/* lock_trx_release_locks() assigns
trx->is_recovered=false */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment