From 2896c87ce4dc789722296f010eaefd5cbb86ece3 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 7 Jan 2011 21:25:34 -0500 Subject: Force pg_upgrade's to preserve pg_class.oid, not pg_class.relfilenode. Toast tables have identical pg_class.oid and pg_class.relfilenode, but for clarity it is good to preserve the pg_class.oid. Update comments regarding what is preserved, and do some variable/function renaming for clarity. --- src/backend/commands/typecmds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/commands/typecmds.c') 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 { -- cgit v1.2.3