Correctly handle subtractions

knizhnik · knizhnik · commit 5e8f5bbe3589 · 2017-04-12T12:26:59.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -821,7 +821,7 @@ MtmXactCallback(XactEvent event, void *arg)
 		MtmEndTransaction(&MtmTx, false);
 		break;
 	  case XACT_EVENT_COMMIT_COMMAND:
-		if (!MtmTx.isTransactionBlock) { 
+		if (!MtmTx.isTransactionBlock && !IsSubTransaction()) { 
 			MtmTwoPhaseCommit(&MtmTx);
 		}
 		break;

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