postgrespro
diff --git a/‎expected/pathman_calamity.out
Copy file name to clipboardExpand all lines: expected/pathman_calamity.out
+1-1Lines changed: 1 addition & 1 deletion b/‎expected/pathman_calamity.out
Copy file name to clipboardExpand all lines: expected/pathman_calamity.out
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/pl_range_funcs.c
Copy file name to clipboardExpand all lines: src/pl_range_funcs.c
-6Lines changed: 0 additions & 6 deletions b/‎src/pl_range_funcs.c
Copy file name to clipboardExpand all lines: src/pl_range_funcs.c
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎src/relation_info.c
Copy file name to clipboardExpand all lines: src/relation_info.c
+3Lines changed: 3 additions & 0 deletions b/‎src/relation_info.c
Copy file name to clipboardExpand all lines: src/relation_info.c
+3Lines changed: 3 additions & 0 deletions
@@ -1009,7 +1009,7 @@ ERROR:  pg_pathman is disabled
 SELECT * FROM pathman_partition_list;							/* not ok */
 ERROR:  pg_pathman is not initialized yet
 SELECT get_part_range('calamity.survivor', 0, NULL::INT);		/* not ok */
-ERROR:  pg_pathman is not initialized yet
+ERROR:  pg_pathman is disabled
 EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor;			/* OK */
           QUERY PLAN          
 ------------------------------
 
@@ -489,9 +489,6 @@ split_range_partition(PG_FUNCTION_ARGS)
 	char			   *query;
 	int					i;
 
-	if (!IsPathmanReady())
-		elog(ERROR, "pg_pathman is disabled");
-
 	if (!PG_ARGISNULL(0))
 	{
 		partition1 = PG_GETARG_OID(0);
@@ -655,9 +652,6 @@ merge_range_partitions(PG_FUNCTION_ARGS)
 	FmgrInfo			finfo;
 	int					i;
 
-	if (!IsPathmanReady())
-		elog(ERROR, "pg_pathman is disabled");
-
 	/* Validate array type */
 	Assert(ARR_ELEMTYPE(arr) == REGCLASSOID);
 
 
@@ -320,6 +320,9 @@ get_pathman_relation_info(Oid relid)
 {
 	PartStatusInfo *psin;
 
+	if (!IsPathmanReady())
+		elog(ERROR, "pg_pathman is disabled");
+
 	/* Should always be called in transaction */
 	Assert(IsTransactionState());
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,9 @@ get_pathman_relation_info(Oid relid)`
`320`	`320`	`{`
`321`	`321`	`PartStatusInfo *psin;`
`322`	`322`
	`323`	`+ if (!IsPathmanReady())`
	`324`	`+ elog(ERROR, "pg_pathman is disabled");`
	`325`	`+`
`323`	`326`	`/* Should always be called in transaction */`
`324`	`327`	`Assert(IsTransactionState());`
`325`	`328`