Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6edea91

Browse files
committed
This is plain wrong, but check to see if DataDir was set *before* runningread_pg_options ... read_pg_options should probably be moved to after thegetopt() instead?
1 parent37f90d8 commit6edea91

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

‎src/backend/tcop/postgres.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.92 1998/10/1319:51:50 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.93 1998/10/1320:05:44 scrappy Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -1005,7 +1005,9 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
10051005
/*
10061006
* Read default pg_options from file $DATADIR/pg_options.
10071007
*/
1008-
read_pg_options(0);
1008+
if(DataDir) {
1009+
read_pg_options(0);
1010+
}
10091011

10101012
optind=1;/* reset after postmaster usage */
10111013

@@ -1512,7 +1514,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
15121514
if (!IsUnderPostmaster)
15131515
{
15141516
puts("\nPOSTGRES backend interactive interface ");
1515-
puts("$Revision: 1.92 $ $Date: 1998/10/1319:51:50 $\n");
1517+
puts("$Revision: 1.93 $ $Date: 1998/10/1320:05:44 $\n");
15161518
}
15171519

15181520
/* ----------------

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp