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

Move get_pkglib_path up into main.c too.

Browse Source
This commit is contained in:
Bruce Momjian 2004-05-18 20:27:25 +00:00
parent a9fad44372
commit eb79aea9ed
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/main/main.c
View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.78 2004/05/18 20:18:57 momjian Exp $ * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.79 2004/05/18 20:27:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -249,6 +249,8 @@ main(int argc, char *argv[])
exit(1); exit(1);
} }
get_pkglib_path(my_exec_path, pkglib_path);
/* /*
* Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain, * Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain,
* SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain * SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain

5
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.389 2004/05/18 20:18:57 momjian Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.390 2004/05/18 20:27:25 momjian Exp $
* *
* NOTES * NOTES
* *
@ -688,9 +688,6 @@ PostmasterMain(int argc, char *argv[])
(errmsg_internal("-----------------------------------------"))); (errmsg_internal("-----------------------------------------")));
} }
if (strlen(pkglib_path) == 0)
get_pkglib_path(my_exec_path, pkglib_path);
#ifdef EXEC_BACKEND #ifdef EXEC_BACKEND
if (find_other_exec(argv[0], "postgres", PG_VERSIONSTR, postgres_exec_path) < 0) if (find_other_exec(argv[0], "postgres", PG_VERSIONSTR, postgres_exec_path) < 0)
ereport(FATAL, ereport(FATAL,

5
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.408 2004/05/18 20:18:58 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.409 2004/05/18 20:27:25 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -2549,9 +2549,6 @@ PostgresMain(int argc, char *argv[], const char *username)
} }
Assert(DataDir); Assert(DataDir);
if (strlen(pkglib_path) == 0)
get_pkglib_path(my_exec_path, pkglib_path);
/* Acquire configuration parameters */ /* Acquire configuration parameters */
if (IsUnderPostmaster) if (IsUnderPostmaster)
{ {