Commit3586931

authored and

committed

Fix problem with rollback of user 2pc transaction

1 parent61d1396 commit3586931Copy full SHA for 3586931

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1359,10 +1359,14 @@ MtmAbortPreparedTransaction(MtmCurrentTrans* x)`
`1359`	`1359`	`tm= (MtmTransMap*)hash_search(MtmGid2State,x->gid,HASH_FIND,NULL);`
`1360`	`1360`	`if (tm==NULL) {`
`1361`	`1361`	`MTM_ELOG(WARNING,"Global transaction ID '%s' is not found",x->gid);`
`1362`		`-}else {`
`1363`		`-Assert(tm->state!=NULL);`
	`1362`	`+}else {`
	`1363`	`+MtmTransState*ts=tm->state;`
	`1364`	`+Assert(ts!=NULL);`
`1364`	`1365`	`MTM_LOG1("Abort prepared transaction %s (%llu)",x->gid, (long64)x->xid);`
`1365`		`-MtmAbortTransaction(tm->state);`
	`1366`	`+MtmAbortTransaction(ts);`
	`1367`	`+if (ts->isTwoPhase) {`
	`1368`	`+MtmDeactivateTransaction(ts);`
	`1369`	`+}`
`1366`	`1370`	`}`
`1367`	`1371`	`MtmUnlock();`
`1368`	`1372`	`x->status=TRANSACTION_STATUS_ABORTED;`

Comments

(0)