Commit89cd7eb

committed

Merge branch 'PGPROEE9_6_MULTIMASTER' into PGPROEE9_6

2 parentsb0ba21c +8ad6794 commit89cd7ebCopy full SHA for 89cd7eb

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

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)) {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,7 @@ process_remote_message(StringInfo s)`
`403`	`403`	`if (rc<0) {`
`404`	`404`	`MTM_ELOG(ERROR,"Failed to execute utility statement %s",messageBody);`
`405`	`405`	`}else {`
	`406`	`+MemoryContextSwitchTo(MtmApplyContext);`
`406`	`407`	`PushActiveSnapshot(GetTransactionSnapshot());`
`407`	`408`
`408`	`409`	`if (MtmVacuumStmt!=NULL) {`

Comments

(0)