Commita41b803

committed

Merge commit '36f934612ca0c941809f9bf35720b4de48504a58' into PGPRO9_6

2 parentsea76dc3 +36f9346 commita41b803Copy full SHA for a41b803

File tree

-4

lines changed

-4

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)`
	`368`	`+if (args->result==InvalidOid\|\|IsAbortedTransactionBlockState())`
`369`	`369`	`AbortCurrentTransaction();`
`370`	`370`	`else`
`371`	`371`	`CommitTransactionCommand();`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -876,9 +876,10 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)`
`876`	`876`	`interval_type, true,&partid);`
`877`	`877`
`878`	`878`	`/* while (value < MIN) ... */`
`879`		`-spawn_partitions(PrelParentRelid(prel),value,min_rvalue,`
`880`		`-prel->atttype,&interval_type_cmp,interval_binary,`
`881`		`-interval_type, false,&partid);`
	`879`	`+if (partid==InvalidOid)`
	`880`	`+spawn_partitions(PrelParentRelid(prel),value,min_rvalue,`
	`881`	`+prel->atttype,&interval_type_cmp,interval_binary,`
	`882`	`+interval_type, false,&partid);`
`882`	`883`
`883`	`884`	`SPI_finish();/* close SPI connection */`
`884`	`885`	`}`

Comments

(0)