From 7f1ab8f742ac42e82dd39a6e11390254cb72319c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 26 Jan 2021 09:05:46 +0200 Subject: Cleanups: que_thr_t::fork_type: Remove. QUE_THR_SUSPENDED, TRX_QUE_COMMITTING: Remove. Cleanup lock_cancel_waiting_and_release() --- storage/innobase/trx/trx0trx.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'storage/innobase/trx/trx0trx.cc') diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index b3ba666b92e..7f704634a42 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1579,7 +1579,7 @@ trx_commit_or_rollback_prepare( if (trx->lock.que_state == TRX_QUE_LOCK_WAIT) { ut_a(trx->lock.wait_thr != NULL); - trx->lock.wait_thr->state = QUE_THR_SUSPENDED; + trx->lock.wait_thr->state = QUE_THR_COMMAND_WAIT; trx->lock.wait_thr = NULL; trx->lock.que_state = TRX_QUE_RUNNING; @@ -1642,7 +1642,6 @@ trx_commit_step( trx_commit_or_rollback_prepare(trx); - trx->lock.que_state = TRX_QUE_COMMITTING; trx->commit(); ut_ad(trx->lock.wait_thr == NULL); trx->lock.que_state = TRX_QUE_RUNNING; @@ -1826,8 +1825,6 @@ state_ok: fputs("LOCK WAIT ", f); break; case TRX_QUE_ROLLING_BACK: fputs("ROLLING BACK ", f); break; - case TRX_QUE_COMMITTING: - fputs("COMMITTING ", f); break; default: fprintf(f, "que state %lu ", (ulong) trx->lock.que_state); } -- cgit v1.2.1