Move get_pkglib_path up into main.c too.

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index e735f487b8715d930618f71ff2e476b26d8a046e..fd78576c1b804a8910c5357abbbbef59fecb376c 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -13,7 +13,7 @@
  *
  *
  * 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);
        }
        
+       get_pkglib_path(my_exec_path, pkglib_path);
+
        /*
         * Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain,
         * SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c9a0d737c44cbb390015425f9e9d5bc753710829..5bed34094c3b53c4292487ff5957d20d30ab1616 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * 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
  *
@@ -688,9 +688,6 @@ PostmasterMain(int argc, char *argv[])
                                (errmsg_internal("-----------------------------------------")));
        }
 
-       if (strlen(pkglib_path) == 0)
-               get_pkglib_path(my_exec_path, pkglib_path);
-
 #ifdef EXEC_BACKEND
        if (find_other_exec(argv[0], "postgres", PG_VERSIONSTR, postgres_exec_path) < 0)
                ereport(FATAL,

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 77fc42e0a549b722896893cc66d6a3219b65e6de..658976f23859425e0291296e897bf099aa5870ab 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
  *       this is the "main" module of the postgres backend and
@@ -2549,9 +2549,6 @@ PostgresMain(int argc, char *argv[], const char *username)
        }
        Assert(DataDir);
 
-       if (strlen(pkglib_path) == 0)
-               get_pkglib_path(my_exec_path, pkglib_path);
-                       
        /* Acquire configuration parameters */
        if (IsUnderPostmaster)
        {