mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In pg_upgrade, clarify use of install_db_support_functions().

Browse Source
This commit is contained in:
Bruce Momjian 2011-01-08 09:11:48 -05:00
parent a60b32b3dc
commit ebaf648ad2
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/pg_upgrade/function.c
View File

@ -13,13 +13,13 @@
/*
* install_db_support_functions()
* install_support_functions_in_db()
*
* pg_upgrade requires some support functions that enable it to modify
* backend behavior.
*/
void
install_db_support_functions(const char *db_name)
install_support_functions_in_db(const char *db_name)
{
PGconn *conn = connectToServer(&new_cluster, db_name);

11
contrib/pg_upgrade/pg_upgrade.c
View File

@ -225,8 +225,11 @@ prepare_new_databases(void)
prep_status("Creating databases in the new cluster");
/* install support functions in the database used by GLOBALS_DUMP_FILE */
install_db_support_functions(os_info.user);
/*
* Install support functions in the database accessed by
* GLOBALS_DUMP_FILE because it can preserve pg_authid.oid.
*/
install_support_functions_in_db(os_info.user);
/*
* We have to create the databases first so we can install support
@ -261,7 +264,9 @@ create_new_objects(void)
{
DbInfo *new_db = &new_cluster.dbarr.dbs[dbnum];
install_db_support_functions(new_db->db_name);
/* skip db we already installed */
if (strcmp(new_db->db_name, os_info.user) != 0)
install_support_functions_in_db(new_db->db_name);
}
check_ok();

2
contrib/pg_upgrade/pg_upgrade.h
View File

@ -321,7 +321,7 @@ void check_hard_link(void);
/* function.c */
void install_db_support_functions(const char *db_name);
void install_support_functions_in_db(const char *db_name);
void uninstall_support_functions(void);
void get_loadable_libraries(void);
void check_loadable_libraries(void);