Commitb303f6c

committed

Merge branch 'master' into picky_nodes

2 parents143fb25 +83cd021 commitb303f6cCopy full SHA for b303f6c

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,6 @@ remove_on_xact_abort_callbacks(void *arg)`
`176`	`176`	`else`
`177`	`177`	`UnregisterSubXactCallback(on_subxact_abort_callback,arg);`
`178`	`178`
`179`		`-Assert(parg->expired== true);/* the job should always be done */`
`180`	`179`	`pfree(arg);`
`181`	`180`	`}`
`182`	`181`
`@@ -219,7 +218,8 @@ on_xact_abort_callback(XactEvent event, void *arg)`
`219`	`218`	`part_abort_argparg= (part_abort_arg)arg;`
`220`	`219`
`221`	`220`	`/* Check that this is an aborted Xact & action has not expired yet */`
`222`		`-if (event==XACT_EVENT_ABORT&& !parg->expired)`
	`221`	`+if ((event==XACT_EVENT_ABORT\|\|event==XACT_EVENT_PARALLEL_ABORT)&&`
	`222`	`+!parg->expired)`
`223`	`223`	`{`
`224`	`224`	`handle_part_event_cancellation(parg);`
`225`	`225`

Comments

(0)