Fix transaction replay debug assertion

A transaction that just completed will go through the start_trx_replay
function as from the client protocol's point of view the transaction is
still open. The debug assertion did not take this into account and would
fail if a successful commit was the last thing done on master that failed.

Also fixed the formatting.
This commit is contained in:
Markus Mäkelä
2018-11-26 12:27:29 +02:00
parent 81937c635b
commit 851793cb86

View File

@ -817,9 +817,10 @@ bool RWSplitSession::start_trx_replay()
} }
else else
{ {
mxb_assert_message(!session_is_autocommit(m_client->session), mxb_assert_message(!session_is_autocommit(m_client->session)
"Session should have autocommit disabled if the transaction " || session_trx_is_ending(m_client->session),
"had no statements and no query was interrupted"); "Session should have autocommit disabled or transaction just ended if the "
"transaction had no statements and no query was interrupted");
} }
rval = true; rval = true;