Commit05d93c3

committed

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

1 parent4172bd8 commit05d93c3Copy full SHA for 05d93c3

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,9 @@ gen_db_file_maps(DbInfo old_db, DbInfo new_db,`
`60`	`60`	`*cannot check relation names when upgrading from pre-8.4.`
`61`	`61`	`*/`
`62`	`62`	`if (strcmp(old_rel->nspname,new_rel->nspname)!=0\|\|`
`63`		`-(GET_MAJOR_VERSION(old_cluster.major_version) >=804&&`
`64`		`-strcmp(old_rel->relname,new_rel->relname)!=0))`
	`63`	`+((GET_MAJOR_VERSION(old_cluster.major_version) >=804\|\|`
	`64`	`+strcmp(old_rel->nspname,"pg_toast")!=0)&&`
	`65`	`+strcmp(old_rel->relname,new_rel->relname)!=0))`
`65`	`66`	`pg_log(PG_FATAL,"Mismatch of relation names: database \"%s\", "`
`66`	`67`	`"old rel %s.%s, new rel %s.%s\n",`
`67`	`68`	`old_db->db_name,old_rel->nspname,old_rel->relname,`

Comments

(0)