Merge commit '9dd080778dc6f9cac5e9affa4fd82909f1197000' into PGPRO9_6

dmpgpro · dmpgpro · commit 95a797f347e1 · 2016-09-27T12:41:03.000+03:00
diff --git a/contrib/pg_pathman/src/pathman_workers.c b/contrib/pg_pathman/src/pathman_workers.c
@@ -365,7 +365,7 @@ bgw_main_spawn_partitions(Datum main_arg)
 											  args->value_type);
 
 	/* Finish transaction in an appropriate way */
-	if (args->result == InvalidOid || IsAbortedTransactionBlockState())
+	if (args->result == InvalidOid)
 		AbortCurrentTransaction();
 	else
 		CommitTransactionCommand();
diff --git a/contrib/pg_pathman/src/pg_pathman.c b/contrib/pg_pathman/src/pg_pathman.c
@@ -902,6 +902,9 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)
 		FreeErrorData(edata);
 
 		SPI_finish(); /* no problem if not connected */
+
+		/* Reset 'partid' in case of error */
+		partid = InvalidOid;
 	}
 	PG_END_TRY();
 

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`