diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-08-26 14:05:33 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-08-26 14:05:33 +0300 |
| commit | b3e381708f87e05b525ed393054d3253d5440fda (patch) | |
| tree | 3f2fdb4e39711018d4f440f9456928bbd2c21e1f /sql/rpl_rli.cc | |
| parent | 21286d88d69952e75b46f9c67dc5297377ec53c3 (diff) | |
| download | mariadb-git-MDEV-742-xa_repl.tar.gz | |
MDEV-742 (intermediate commit)MDEV-742-xa_repl
typ == XID_EVENT || typ == XA_PREPARE_LOG_EVENT augmentation.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 0d8a5ad490b..45dfedcd582 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -2234,10 +2234,10 @@ void rpl_group_info::cleanup_context(THD *thd, bool error) It could be done only after necessarily closing tables which dictates the following placement. */ - XID_STATE *xid_state= &thd->transaction.xid_state; - if (xid_state->is_explicit_XA()) + if (thd->transaction.xid_state.is_explicit_XA()) { xa_trans_force_rollback(thd); + attach_native_trx(thd); } thd->mdl_context.release_transactional_locks(); |