diff options
| author | Bruce Momjian | 2011-03-06 11:34:58 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2011-03-06 11:34:58 +0000 |
| commit | a54ba23c087a23222a7c76b33c61cddad5278712 (patch) | |
| tree | 1aa7d149af960546d2487f7f518facd4642f357c | |
| parent | 8f87dcd863c2fe2940129ea58343bc0e56cb290c (diff) | |
Improve pg_upgrade relation name check logic for pre-8.4 servers.
| -rw-r--r-- | contrib/pg_upgrade/info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index fe060ff326..9cd3441e52 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -56,11 +56,11 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, /* * In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4 - * TOAST relation names always use the heap tables oid, hence we + * TOAST relation names always use heap table oids, hence we * cannot check relation names when upgrading from pre-8.4. */ - if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804 && - (strcmp(old_rel->nspname, new_rel->nspname) != 0 || + if (strcmp(old_rel->nspname, new_rel->nspname) != 0 || + (GET_MAJOR_VERSION(old_cluster.major_version) >= 804 && strcmp(old_rel->relname, new_rel->relname) != 0)) pg_log(PG_FATAL, "Mismatch of relation names: database \"%s\", " "old rel %s.%s, new rel %s.%s\n", |