diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-01-07 21:25:34 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-01-07 21:26:13 -0500 |
| commit | 2896c87ce4dc789722296f010eaefd5cbb86ece3 (patch) | |
| tree | 5e98d2ca57edf90e7224dfe1ddf0764dc6a56bef /src/backend/commands/typecmds.c | |
| parent | 541fc3d4df66a5e51d172a78288069bd92dda0c8 (diff) | |
| download | postgresql-2896c87ce4dc789722296f010eaefd5cbb86ece3.tar.gz postgresql-2896c87ce4dc789722296f010eaefd5cbb86ece3.zip | |
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.
Diffstat (limited to 'src/backend/commands/typecmds.c')
| -rw-r--r-- | src/backend/commands/typecmds.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |