diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 16:16:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 16:16:29 +0200 |
| commit | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (patch) | |
| tree | 092e6e25b30833ee3521d1179b1b8767db020981 /sql/xa.cc | |
| parent | 589cf8dbf3accf57673d7e2f7a4435f7eaf33565 (diff) | |
| download | mariadb-git-24ec8eaf66ecd864529309c5edcb8dd6b685f2aa.tar.gz | |
MDEV-15532 after-merge fixes from Monty
The Galera tests were massively failing with debug assertions.
Diffstat (limited to 'sql/xa.cc')
| -rw-r--r-- | sql/xa.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/xa.cc b/sql/xa.cc index 6275532e035..85fbe9358a3 100644 --- a/sql/xa.cc +++ b/sql/xa.cc @@ -399,6 +399,7 @@ static bool xa_trans_force_rollback(THD *thd) xid_cache_delete(thd, &thd->transaction.xid_state); trans_track_end_trx(thd); + thd->mdl_context.release_transactional_locks(thd); return rc; } @@ -603,7 +604,7 @@ bool trans_xa_commit(THD *thd) xid_cache_delete(thd, &thd->transaction.xid_state); trans_track_end_trx(thd); - thd->mdl_context.release_transactional_locks(); + thd->mdl_context.release_transactional_locks(thd); DBUG_RETURN(res); } @@ -677,6 +678,8 @@ bool trans_xa_detach(THD *thd) thd->transaction.all.no_2pc= 0; thd->server_status&= ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); + thd->mdl_context.release_transactional_locks(thd); + return false; #endif } |