diff options
Diffstat (limited to 'storage/xtradb/trx/trx0trx.cc')
| -rw-r--r-- | storage/xtradb/trx/trx0trx.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/storage/xtradb/trx/trx0trx.cc b/storage/xtradb/trx/trx0trx.cc index bbf76effc52..0e2b821738e 100644 --- a/storage/xtradb/trx/trx0trx.cc +++ b/storage/xtradb/trx/trx0trx.cc @@ -1190,12 +1190,12 @@ trx_write_serialisation_history( MONITOR_INC(MONITOR_TRX_COMMIT_UNDO); #ifdef WITH_WSREP - sys_header = trx_sysf_get(mtr); - /* Update latest MySQL wsrep XID in trx sys header. */ - if (wsrep_is_wsrep_xid((const void *)&trx->xid)) - { - trx_sys_update_wsrep_checkpoint(&trx->xid, sys_header, mtr); - } + sys_header = trx_sysf_get(&mtr); + /* Update latest MySQL wsrep XID in trx sys header. */ + if (wsrep_is_wsrep_xid(&trx->xid)) + { + trx_sys_update_wsrep_checkpoint(&trx->xid, sys_header, &mtr); + } #endif /* WITH_WSREP */ /* Update the latest MySQL binlog name and offset info @@ -1517,8 +1517,6 @@ trx_commit_in_memory( ut_ad(!trx->in_ro_trx_list); ut_ad(!trx->in_rw_trx_list); - trx->dict_operation = TRX_DICT_OP_NONE; - #ifdef WITH_WSREP if (wsrep_on(trx->mysql_thd)) { trx->lock.was_chosen_as_deadlock_victim = FALSE; |