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/trx/trx0roll.cc | |
| 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/trx/trx0roll.cc')
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 75bffd91aa7..637f8b709f5 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -228,6 +228,9 @@ dberr_t trx_rollback_for_mysql(trx_t* trx) case TRX_STATE_NOT_STARTED: trx->will_lock = 0; ut_ad(trx->mysql_thd); +#ifdef WITH_WSREP + trx->wsrep = false; +#endif return(DB_SUCCESS); case TRX_STATE_ACTIVE: |