Fix handling of dynamic DDL statements

knizhnik · knizhnik · commit 87ea87b3e7d2 · 2017-04-06T16:17:14.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -5119,7 +5119,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	}
 
 	/* XXX: dirty. Clear on new tx */
-	if (!skipCommand && (context == PROCESS_UTILITY_TOPLEVEL || MtmUtilityProcessedInXid != GetCurrentTransactionId()))
+	if (!skipCommand && (context != PROCESS_UTILITY_SUBCOMMAND || MtmUtilityProcessedInXid != GetCurrentTransactionId()))
 		MtmUtilityProcessedInXid = InvalidTransactionId;
 
 	if (!skipCommand && !MtmTx.isReplicated && (MtmUtilityProcessedInXid == InvalidTransactionId)) {

Original file line number	Diff line number	Diff line change
`@@ -5119,7 +5119,7 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`5119`	`5119`	`}`
`5120`	`5120`
`5121`	`5121`	`/* XXX: dirty. Clear on new tx */`
`5122`		`- if (!skipCommand && (context == PROCESS_UTILITY_TOPLEVEL \|\| MtmUtilityProcessedInXid != GetCurrentTransactionId()))`
	`5122`	`+ if (!skipCommand && (context != PROCESS_UTILITY_SUBCOMMAND \|\| MtmUtilityProcessedInXid != GetCurrentTransactionId()))`
`5123`	`5123`	`MtmUtilityProcessedInXid = InvalidTransactionId;`
`5124`	`5124`
`5125`	`5125`	`if (!skipCommand && !MtmTx.isReplicated && (MtmUtilityProcessedInXid == InvalidTransactionId)) {`