2 files changed, 6 insertions, 45 deletions

diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 5a0ae99750f..d897bbec2ba 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -168,15 +168,6 @@ static relopt_bool boolRelOpts[] =
 		},
 		true
 	},
-	{
-		{
-			"parallel_insert_enabled",
-			"Enables \"parallel insert\" feature for this table",
-			RELOPT_KIND_HEAP | RELOPT_KIND_PARTITIONED,
-			ShareUpdateExclusiveLock
-		},
-		true
-	},
 	/* list terminator */
 	{{NULL}}
 };
@@ -1868,9 +1859,7 @@ default_reloptions(Datum reloptions, bool validate, relopt_kind kind)
 		{"vacuum_index_cleanup", RELOPT_TYPE_BOOL,
 		offsetof(StdRdOptions, vacuum_index_cleanup)},
 		{"vacuum_truncate", RELOPT_TYPE_BOOL,
-		offsetof(StdRdOptions, vacuum_truncate)},
-		{"parallel_insert_enabled", RELOPT_TYPE_BOOL,
-		offsetof(StdRdOptions, parallel_insert_enabled)}
+		offsetof(StdRdOptions, vacuum_truncate)}
 	};
 
 	return (bytea *) build_reloptions(reloptions, validate, kind,
@@ -1972,15 +1961,13 @@ build_local_reloptions(local_relopts *relopts, Datum options, bool validate)
 bytea *
 partitioned_table_reloptions(Datum reloptions, bool validate)
 {
-	static const relopt_parse_elt tab[] = {
-		{"parallel_insert_enabled", RELOPT_TYPE_BOOL,
-		offsetof(PartitionedTableRdOptions, parallel_insert_enabled)}
-	};
-
+	/*
+	 * There are no options for partitioned tables yet, but this is able to do
+	 * some validation.
+	 */
 	return (bytea *) build_reloptions(reloptions, validate,
 									  RELOPT_KIND_PARTITIONED,
-									  sizeof(PartitionedTableRdOptions),
-									  tab, lengthof(tab));
+									  0, NULL, 0);
 }
 
 /*
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 6395a9b2408..c83aa16f2ce 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -1015,32 +1015,6 @@ IsInParallelMode(void)
 }
 
 /*
- *	PrepareParallelModePlanExec
- *
- * Prepare for entering parallel mode plan execution, based on command-type.
- */
-void
-PrepareParallelModePlanExec(CmdType commandType)
-{
-	if (IsModifySupportedInParallelMode(commandType))
-	{
-		Assert(!IsInParallelMode());
-
-		/*
-		 * Prepare for entering parallel mode by assigning a TransactionId.
-		 * Failure to do this now would result in heap_insert() subsequently
-		 * attempting to assign a TransactionId whilst in parallel-mode, which
-		 * is not allowed.
-		 *
-		 * This approach has a disadvantage in that if the underlying SELECT
-		 * does not return any rows, then the TransactionId is not used,
-		 * however that shouldn't happen in practice in many cases.
-		 */
-		(void) GetCurrentTransactionId();
-	}
-}
-
-/*
  *	CommandCounterIncrement
  */
 void