mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tighten pg_upgrade check for pre-8.4 toast table name matching.

This commit is contained in:
Bruce Momjian 2011-03-06 21:57:02 -05:00
parent 4172bd8830
commit 05d93c38a7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pg_upgrade/info.c
View File

@ -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,