4 files changed, 24 insertions, 24 deletions

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index b36efcdba3c..5dfd8141eb6 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -74,8 +74,8 @@
 
 
 /* Potentially set by contrib/pg_upgrade_support functions */
-Oid			binary_upgrade_next_heap_relfilenode = InvalidOid;
-Oid			binary_upgrade_next_toast_relfilenode = InvalidOid;
+Oid			binary_upgrade_next_heap_pg_class_oid = InvalidOid;
+Oid			binary_upgrade_next_toast_pg_class_oid = InvalidOid;
 
 static void AddNewRelationTuple(Relation pg_class_desc,
 					Relation new_rel_desc,
@@ -987,22 +987,22 @@ heap_create_with_catalog(const char *relname,
 	if (!OidIsValid(relid))
 	{
 		/*
-		 *	Use binary-upgrade override for pg_class.relfilenode/oid,
+		 *	Use binary-upgrade override for pg_class.oid/relfilenode,
 		 *	if supplied.
 		 */
-		if (OidIsValid(binary_upgrade_next_heap_relfilenode) &&
+		if (OidIsValid(binary_upgrade_next_heap_pg_class_oid) &&
 			(relkind == RELKIND_RELATION || relkind == RELKIND_SEQUENCE ||
 			 relkind == RELKIND_VIEW || relkind == RELKIND_COMPOSITE_TYPE ||
 			 relkind == RELKIND_FOREIGN_TABLE))
 		{
-			relid = binary_upgrade_next_heap_relfilenode;
-			binary_upgrade_next_heap_relfilenode = InvalidOid;
+			relid = binary_upgrade_next_heap_pg_class_oid;
+			binary_upgrade_next_heap_pg_class_oid = InvalidOid;
 		}
-		else if (OidIsValid(binary_upgrade_next_toast_relfilenode) &&
+		else if (OidIsValid(binary_upgrade_next_toast_pg_class_oid) &&
 				 relkind == RELKIND_TOASTVALUE)
 		{
-			relid = binary_upgrade_next_toast_relfilenode;
-			binary_upgrade_next_toast_relfilenode = InvalidOid;
+			relid = binary_upgrade_next_toast_pg_class_oid;
+			binary_upgrade_next_toast_pg_class_oid = InvalidOid;
 		}
 		else
 			relid = GetNewRelFileNode(reltablespace, pg_class_desc,
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index b45db4c9ec3..5790f872fe6 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -69,7 +69,7 @@
 
 
 /* Potentially set by contrib/pg_upgrade_support functions */
-Oid			binary_upgrade_next_index_relfilenode = InvalidOid;
+Oid			binary_upgrade_next_index_pg_class_oid = InvalidOid;
 
 /* state info for validate_index bulkdelete callback */
 typedef struct
@@ -641,13 +641,13 @@ index_create(Oid heapRelationId,
 	if (!OidIsValid(indexRelationId))
 	{
 		/*
-		 *	Use binary-upgrade override for pg_class.relfilenode/oid,
+		 *	Use binary-upgrade override for pg_class.oid/relfilenode,
 		 *	if supplied.
 		 */
-		if (OidIsValid(binary_upgrade_next_index_relfilenode))
+		if (OidIsValid(binary_upgrade_next_index_pg_class_oid))
 		{
-			indexRelationId = binary_upgrade_next_index_relfilenode;
-			binary_upgrade_next_index_relfilenode = InvalidOid;
+			indexRelationId = binary_upgrade_next_index_pg_class_oid;
+			binary_upgrade_next_index_pg_class_oid = InvalidOid;
 		}
 		else
 		{
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index e4951226818..142beaeb6e6 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -32,9 +32,9 @@
 #include "utils/syscache.h"
 
 /* Potentially set by contrib/pg_upgrade_support functions */
-extern Oid	binary_upgrade_next_toast_relfilenode;
+extern Oid	binary_upgrade_next_toast_pg_class_oid;
 
-Oid			binary_upgrade_next_pg_type_toast_oid = InvalidOid;
+Oid			binary_upgrade_next_toast_pg_type_oid = InvalidOid;
 
 static bool create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 				   Datum reloptions);
@@ -156,7 +156,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Datum reloptio
 	 * creation even if it seems not to need one.
 	 */
 	if (!needs_toast_table(rel) &&
-		!OidIsValid(binary_upgrade_next_toast_relfilenode))
+		!OidIsValid(binary_upgrade_next_toast_pg_class_oid))
 		return false;
 
 	/*
@@ -201,10 +201,10 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Datum reloptio
 		namespaceid = PG_TOAST_NAMESPACE;
 
 	/* Use binary-upgrade override for pg_type.oid, if supplied. */
-	if (OidIsValid(binary_upgrade_next_pg_type_toast_oid))
+	if (OidIsValid(binary_upgrade_next_toast_pg_type_oid))
 	{
-		toast_typid = binary_upgrade_next_pg_type_toast_oid;
-		binary_upgrade_next_pg_type_toast_oid = InvalidOid;
+		toast_typid = binary_upgrade_next_toast_pg_type_oid;
+		binary_upgrade_next_toast_pg_type_oid = InvalidOid;
 	}
 
 	toast_relid = heap_create_with_catalog(toast_relname,
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index bc66c3e6400..2ecb238b9eb 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -75,7 +75,7 @@ typedef struct
 } RelToCheck;
 
 /* Potentially set by contrib/pg_upgrade_support functions */
-Oid			binary_upgrade_next_pg_type_array_oid = InvalidOid;
+Oid			binary_upgrade_next_array_pg_type_oid = InvalidOid;
 
 static Oid	findTypeInputFunction(List *procname, Oid typeOid);
 static Oid	findTypeOutputFunction(List *procname, Oid typeOid);
@@ -1519,10 +1519,10 @@ AssignTypeArrayOid(void)
 	Oid			type_array_oid;
 
 	/* Use binary-upgrade override for pg_type.typarray, if supplied. */
-	if (OidIsValid(binary_upgrade_next_pg_type_array_oid))
+	if (OidIsValid(binary_upgrade_next_array_pg_type_oid))
 	{
-		type_array_oid = binary_upgrade_next_pg_type_array_oid;
-		binary_upgrade_next_pg_type_array_oid = InvalidOid;
+		type_array_oid = binary_upgrade_next_array_pg_type_oid;
+		binary_upgrade_next_array_pg_type_oid = InvalidOid;
 	}
 	else
 	{