diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-04 18:19:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-04 18:31:30 +0300 |
| commit | 5e7e7153b439ea1b12588f5830d66b3a0cf13414 (patch) | |
| tree | bd3751b69f9470f1b9b9f26cc301c340ca70d293 /storage/innobase/include/trx0trx.h | |
| parent | f5cff8980a7f55069b01dcc9e124880c75930c91 (diff) | |
| download | mariadb-git-5e7e7153b439ea1b12588f5830d66b3a0cf13414.tar.gz | |
MDEV-22452: Missing call to wsrep_commit_ordered in trx_t::commit()
This is a follow-up fix to the changes that were made in MDEV-7962.
assert_trx_is_free(): Assert !is_wsrep().
trx_init(): Do not initialize trx->wsrep, because it must have been
initialized already.
trx_t::commit_in_memory(): Invoke wsrep_commit_ordered(). This call
was being skipped, because the transaction object had already been
freed to the pool.
trx_rollback_for_mysql(), innobase_commit_low(),
innobase_close_connection(): Always reset trx->wsrep.
Diffstat (limited to 'storage/innobase/include/trx0trx.h')
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 3856915f8a6..87bf97f00cf 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -443,6 +443,7 @@ Check transaction state */ ut_ad(!(t)->id); \ ut_ad(!(t)->has_logged()); \ ut_ad(!(t)->is_referenced()); \ + ut_ad(!(t)->is_wsrep()); \ ut_ad(!(t)->read_view.is_open()); \ ut_ad((t)->lock.wait_thr == NULL); \ ut_ad(UT_LIST_GET_LEN((t)->lock.trx_locks) == 0); \ |