Commita54ba23

committed

Improve pg_upgrade relation name check logic for pre-8.4 servers.

1 parent8f87dcd commita54ba23Copy full SHA for a54ba23

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,11 @@ gen_db_file_maps(DbInfo old_db, DbInfo new_db,`
`56`	`56`
`57`	`57`	`/*`
`58`	`58`	`*In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4`
`59`		`- *TOAST relation names always usetheheaptables oid, hence we`
	`59`	`+ *TOAST relation names always use heaptable oids, hence we`
`60`	`60`	`*cannot check relation names when upgrading from pre-8.4.`
`61`	`61`	`*/`
`62`		`-if (GET_MAJOR_VERSION(old_cluster.major_version) >=804&&`
`63`		`-(strcmp(old_rel->nspname,new_rel->nspname)!=0\|\|`
	`62`	`+if (strcmp(old_rel->nspname,new_rel->nspname)!=0\|\|`
	`63`	`+(GET_MAJOR_VERSION(old_cluster.major_version) >=804&&`
`64`	`64`	`strcmp(old_rel->relname,new_rel->relname)!=0))`
`65`	`65`	`pg_log(PG_FATAL,"Mismatch of relation names: database \"%s\", "`
`66`	`66`	`"old rel %s.%s, new rel %s.%s\n",`

Comments

(0)