From 05d93c38a791836eeceaf8edb0ea8cb19cdf2760 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sun, 6 Mar 2011 21:57:02 -0500 Subject: [PATCH] Tighten pg_upgrade check for pre-8.4 toast table name matching. --- contrib/pg_upgrade/info.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index 9cd3441e52..9f74493e1f 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -60,8 +60,9 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, * cannot check relation names when upgrading from pre-8.4. */ 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)) + ((GET_MAJOR_VERSION(old_cluster.major_version) >= 804 || + strcmp(old_rel->nspname, "pg_toast") != 0) && + 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", old_db->db_name, old_rel->nspname, old_rel->relname,