Commit6238473

committed

Fix pg_upgrade to create pg_authid restore functions in the 'postgres'

database, not in the os-user database, per report from Magnus.

1 parent9e95c9a commit6238473Copy full SHA for 6238473

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ static void set_frozenxids(void);`
`50`	`50`	`staticvoidsetup(char*argv0,boollive_check);`
`51`	`51`	`staticvoidcleanup(void);`
`52`	`52`
	`53`	`+/* This is the database used by pg_dumpall to restore global tables */`
	`54`	`+#defineGLOBAL_DUMP_DB"postgres"`
	`55`	`+`
`53`	`56`	`ClusterInfoold_cluster,new_cluster;`
`54`	`57`	`OSInfoos_info;`
`55`	`58`
`@@ -226,10 +229,10 @@ prepare_new_databases(void)`
`226`	`229`	`prep_status("Creating databases in the new cluster");`
`227`	`230`
`228`	`231`	`/*`
`229`		`- *Install support functions in thedatabase accessed by`
`230`		`- *GLOBALS_DUMP_FILE because it can preserve pg_authid.oid.`
	`232`	`+ *Install support functions in theglobal-restore database`
	`233`	`+ *to preserve pg_authid.oid.`
`231`	`234`	`*/`
`232`		`-install_support_functions_in_new_db(os_info.user);`
	`235`	`+install_support_functions_in_new_db(GLOBAL_DUMP_DB);`
`233`	`236`
`234`	`237`	`/*`
`235`	`238`	`* We have to create the databases first so we can install support`
`@@ -266,7 +269,7 @@ create_new_objects(void)`
`266`	`269`	`DbInfo*new_db=&new_cluster.dbarr.dbs[dbnum];`
`267`	`270`
`268`	`271`	`/* skip db we already installed */`
`269`		`-if (strcmp(new_db->db_name,os_info.user)!=0)`
	`272`	`+if (strcmp(new_db->db_name,GLOBAL_DUMP_DB)!=0)`
`270`	`273`	`install_support_functions_in_new_db(new_db->db_name);`
`271`	`274`	`}`
`272`	`275`	`check_ok();`

Comments

(0)