Commit95a797f

committed

Merge commit '9dd080778dc6f9cac5e9affa4fd82909f1197000' into PGPRO9_6

2 parentsa41b803 +9dd0807 commit95a797fCopy full SHA for 95a797f

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ bgw_main_spawn_partitions(Datum main_arg)`
`365`	`365`	`args->value_type);`
`366`	`366`
`367`	`367`	`/* Finish transaction in an appropriate way */`
`368`		`-if (args->result==InvalidOid\|\|IsAbortedTransactionBlockState())`
	`368`	`+if (args->result==InvalidOid)`
`369`	`369`	`AbortCurrentTransaction();`
`370`	`370`	`else`
`371`	`371`	`CommitTransactionCommand();`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -902,6 +902,9 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)`
`902`	`902`	`FreeErrorData(edata);`
`903`	`903`
`904`	`904`	`SPI_finish();/* no problem if not connected */`
	`905`	`+`
	`906`	`+/* Reset 'partid' in case of error */`
	`907`	`+partid=InvalidOid;`
`905`	`908`	`}`
`906`	`909`	`PG_END_TRY();`
`907`	`910`

Comments

(0)