|
11 | 11 | * |
12 | 12 | * |
13 | 13 | * IDENTIFICATION |
14 | | - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.139 2000/04/12 17:15:31 momjian Exp $ |
| 14 | + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.140 2000/04/27 02:59:17 tgl Exp $ |
15 | 15 | * |
16 | 16 | * NOTES |
17 | 17 | * |
@@ -1725,11 +1725,8 @@ BackendStartup(Port *port) |
1725 | 1725 | putenv(envEntry[1]); |
1726 | 1726 | sprintf(envEntry[2],"PG_USER=%s",port->user); |
1727 | 1727 | putenv(envEntry[2]); |
1728 | | -if (!getenv("PGDATA")) |
1729 | | -{ |
1730 | | -sprintf(envEntry[3],"PGDATA=%s",DataDir); |
1731 | | -putenv(envEntry[3]); |
1732 | | -} |
| 1728 | +sprintf(envEntry[3],"PGDATA=%s",DataDir); |
| 1729 | +putenv(envEntry[3]); |
1733 | 1730 | sprintf(envEntry[4],"IPC_KEY=%d",ipc_key); |
1734 | 1731 | putenv(envEntry[4]); |
1735 | 1732 |
|
@@ -2175,11 +2172,8 @@ SSDataBase(bool startup) |
2175 | 2172 | putenv(ssEntry[0]); |
2176 | 2173 | sprintf(ssEntry[1],"POSTID=%d",NextBackendTag); |
2177 | 2174 | putenv(ssEntry[1]); |
2178 | | -if (!getenv("PGDATA")) |
2179 | | -{ |
2180 | | -sprintf(ssEntry[2],"PGDATA=%s",DataDir); |
2181 | | -putenv(ssEntry[2]); |
2182 | | -} |
| 2175 | +sprintf(ssEntry[2],"PGDATA=%s",DataDir); |
| 2176 | +putenv(ssEntry[2]); |
2183 | 2177 | sprintf(ssEntry[3],"IPC_KEY=%d",ipc_key); |
2184 | 2178 | putenv(ssEntry[3]); |
2185 | 2179 |
|
|