diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-05-26 13:54:02 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-05-26 13:54:02 +0200 |
| commit | 98a2c6b69edbf5bdd45b4aae8f18284c83dd4725 (patch) | |
| tree | 799e402f176132979e3e9424b25db471336390d1 /storage | |
| parent | ca38b6e42791a6edbd3cc0b626a8d06b7776e76b (diff) | |
| parent | 1af6e92f0b106c0588f89c51b749c573262e82d1 (diff) | |
| download | mariadb-git-98a2c6b69edbf5bdd45b4aae8f18284c83dd4725.tar.gz | |
Merge branch '10.4-MDEV-22666-v2' of https://github.com/codership/mariadb-server into codership-10.4-MDEV-22666-v2
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index d78cbcac521..ca3d858364a 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1511,12 +1511,6 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr) if (fts_trx) trx_finalize_for_fts(this, undo_no != 0); - trx_mutex_enter(this); - dict_operation= TRX_DICT_OP_NONE; - - DBUG_LOG("trx", "Commit in memory: " << this); - state= TRX_STATE_NOT_STARTED; - #ifdef WITH_WSREP /* Serialization history has been written and the transaction is committed in memory, which makes this commit ordered. Release commit @@ -1528,6 +1522,11 @@ inline void trx_t::commit_in_memory(const mtr_t *mtr) } lock.was_chosen_as_wsrep_victim= false; #endif /* WITH_WSREP */ + trx_mutex_enter(this); + dict_operation= TRX_DICT_OP_NONE; + + DBUG_LOG("trx", "Commit in memory: " << this); + state= TRX_STATE_NOT_STARTED; assert_freed(); trx_init(this); |