|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * 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 $ |
11 | 11 | * |
12 | 12 | * NOTES |
13 | 13 | * 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[]) |
1005 | 1005 | /* |
1006 | 1006 | * Read default pg_options from file $DATADIR/pg_options. |
1007 | 1007 | */ |
1008 | | -read_pg_options(0); |
| 1008 | +if(DataDir) { |
| 1009 | +read_pg_options(0); |
| 1010 | +} |
1009 | 1011 |
|
1010 | 1012 | optind=1;/* reset after postmaster usage */ |
1011 | 1013 |
|
@@ -1512,7 +1514,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) |
1512 | 1514 | if (!IsUnderPostmaster) |
1513 | 1515 | { |
1514 | 1516 | 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"); |
1516 | 1518 | } |
1517 | 1519 |
|
1518 | 1520 | /* ---------------- |
|