diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-26 09:05:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-27 15:45:39 +0200 |
| commit | 7f1ab8f742ac42e82dd39a6e11390254cb72319c (patch) | |
| tree | 3b9ec2bdef07e4f4a151fe1b304291d4396c6cfb /storage/innobase/trx/trx0trx.cc | |
| parent | ff3f07ce82a664148bbefdb2b7d6266aa8dd09fc (diff) | |
| download | mariadb-git-7f1ab8f742ac42e82dd39a6e11390254cb72319c.tar.gz | |
Cleanups:
que_thr_t::fork_type: Remove.
QUE_THR_SUSPENDED, TRX_QUE_COMMITTING: Remove.
Cleanup lock_cancel_waiting_and_release()
Diffstat (limited to 'storage/innobase/trx/trx0trx.cc')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 5 |
1 files changed, 1 insertions, 4 deletions
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); } |