Commiteb79aea

committed

Move get_pkglib_path up into main.c too.

1 parenta9fad44 commiteb79aeaCopy full SHA for eb79aea

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.78 2004/05/18 20:18:57 momjian Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.79 2004/05/18 20:27:24 momjian Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -249,6 +249,8 @@ main(int argc, char *argv[])`
`249`	`249`	`exit(1);`
`250`	`250`	`}`
`251`	`251`
	`252`	`+get_pkglib_path(my_exec_path,pkglib_path);`
	`253`	`+`
`252`	`254`	`/*`
`253`	`255`	`* Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain,`
`254`	`256`	`* SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.389 2004/05/18 20:18:57 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.390 2004/05/18 20:27:25 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -688,9 +688,6 @@ PostmasterMain(int argc, char *argv[])`
`688`	`688`	`(errmsg_internal("-----------------------------------------")));`
`689`	`689`	`}`
`690`	`690`
`691`		`-if (strlen(pkglib_path)==0)`
`692`		`-get_pkglib_path(my_exec_path,pkglib_path);`
`693`		`-`
`694`	`691`	`#ifdefEXEC_BACKEND`
`695`	`692`	`if (find_other_exec(argv[0],"postgres",PG_VERSIONSTR,postgres_exec_path)<0)`
`696`	`693`	`ereport(FATAL,`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.408 2004/05/18 20:18:58 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.409 2004/05/18 20:27:25 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2549,9 +2549,6 @@ PostgresMain(int argc, char argv[], const char username)`
`2549`	`2549`	`}`
`2550`	`2550`	`Assert(DataDir);`
`2551`	`2551`
`2552`		`-if (strlen(pkglib_path)==0)`
`2553`		`-get_pkglib_path(my_exec_path,pkglib_path);`
`2554`		`-`
`2555`	`2552`	`/* Acquire configuration parameters */`
`2556`	`2553`	`if (IsUnderPostmaster)`
`2557`	`2554`	`{`

Comments

(0)