Merge commit '36f934612ca0c941809f9bf35720b4de48504a58' into PGPRO9_6

dmpgpro · dmpgpro · commit a41b80306d88 · 2016-09-27T12:25:27.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)
+	if (args->result == InvalidOid || IsAbortedTransactionBlockState())
 		AbortCurrentTransaction();
 	else
 		CommitTransactionCommand();
diff --git a/contrib/pg_pathman/src/pg_pathman.c b/contrib/pg_pathman/src/pg_pathman.c
@@ -876,9 +876,10 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)
 							 interval_type, true, &partid);
 
 			/* while (value < MIN) ... */
-			spawn_partitions(PrelParentRelid(prel), value, min_rvalue,
-							 prel->atttype, &interval_type_cmp, interval_binary,
-							 interval_type, false, &partid);
+			if (partid == InvalidOid)
+				spawn_partitions(PrelParentRelid(prel), value, min_rvalue,
+								 prel->atttype, &interval_type_cmp, interval_binary,
+								 interval_type, false, &partid);
 
 			SPI_finish(); /* close SPI connection */
 		}
