diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-28 10:18:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-28 10:18:41 +0300 |
| commit | e41eb044f19e3ee9b881344565924dd6b9d20e1a (patch) | |
| tree | 72db01fe401eca2e794b9f02edec0200e78416b6 /storage/innobase/trx | |
| parent | 947b0b5722117350c83656ee0b23502be59b7d2b (diff) | |
| parent | 7aac83580a5c5a6042b5d03d1031750cb0d5d6ea (diff) | |
| download | mariadb-git-e41eb044f19e3ee9b881344565924dd6b9d20e1a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 723e8458c6d..2eb3161f3b7 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -492,6 +492,7 @@ trx_free_at_shutdown(trx_t *trx) transaction was never committed and therefore lock_trx_release() was not called. */ trx->lock.table_locks.clear(); + trx->id = 0; trx_free(trx); } @@ -1333,10 +1334,8 @@ trx_commit_in_memory( trx_sys.deregister_rw(trx); } - /* trx->id will be cleared in lock_trx_release_locks(trx). */ - ut_ad(trx->read_only || !trx->rsegs.m_redo.rseg || trx->id); lock_trx_release_locks(trx); - ut_ad(trx->id == 0); + ut_ad(trx->read_only || !trx->rsegs.m_redo.rseg || trx->id); /* Remove the transaction from the list of active transactions now that it no longer holds any user locks. */ @@ -1350,6 +1349,8 @@ trx_commit_in_memory( trx_update_mod_tables_timestamp(trx); MONITOR_INC(MONITOR_TRX_RW_COMMIT); } + + trx->id = 0; } ut_ad(!trx->rsegs.m_redo.undo); |