Correctly handle subtractions

knizhnik · kelvich · commit dc89773a2a06 · 2017-11-13T02:17:39.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -822,7 +822,7 @@ MtmXactCallback(XactEvent event, void *arg)
 		MtmEndTransaction(&MtmTx, false);
 		break;
 	  case XACT_EVENT_COMMIT_COMMAND:
-		if (!IsTransactionBlock()) { 
+		if (!MtmTx.isTransactionBlock && !IsSubTransaction()) { 
 			MtmTwoPhaseCommit(&MtmTx);
 		}
 		break;

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ MtmXactCallback(XactEvent event, void *arg)`
`822`	`822`	`MtmEndTransaction(&MtmTx, false);`
`823`	`823`	`break;`
`824`	`824`	`case XACT_EVENT_COMMIT_COMMAND:`
`825`		`- if (!IsTransactionBlock()) {`
	`825`	`+ if (!MtmTx.isTransactionBlock && !IsSubTransaction()) {`
`826`	`826`	`MtmTwoPhaseCommit(&MtmTx);`
`827`	`827`	`}`
`828`	`828`	`break;`