1
0
mirror of https://github.com/postgres/postgres.git synced 2025-10-25 13:17:41 +03:00

Reverse out XLogDir/-X write-ahead log handling, per discussion.

Original patch from Thomas.
This commit is contained in:
Bruce Momjian
2002-08-17 15:12:07 +00:00
parent 7c02c86d0f
commit d04e9137c9
8 changed files with 57 additions and 157 deletions

View File

@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.283 2002/08/10 20:29:18 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.284 2002/08/17 15:12:06 momjian Exp $
*
* NOTES
*
@@ -346,7 +346,6 @@ PostmasterMain(int argc, char *argv[])
int status;
char original_extraoptions[MAXPGPATH];
char *potential_DataDir = NULL;
char *potential_XLogDir = NULL;
*original_extraoptions = '\0';
@@ -404,11 +403,10 @@ PostmasterMain(int argc, char *argv[])
InitializeGUCOptions();
potential_DataDir = getenv("PGDATA"); /* default value */
potential_XLogDir = getenv("PGXLOG"); /* default value */
opterr = 1;
while ((opt = getopt(argc, argv, "A:a:B:b:c:D:X:d:Fh:ik:lm:MN:no:p:Ss-:")) != -1)
while ((opt = getopt(argc, argv, "A:a:B:b:c:D:d:Fh:ik:lm:MN:no:p:Ss-:")) != -1)
{
switch (opt)
{
@@ -431,9 +429,6 @@ PostmasterMain(int argc, char *argv[])
case 'D':
potential_DataDir = optarg;
break;
case 'X':
potential_XLogDir = optarg;
break;
case 'd':
{
/* Turn on debugging for the postmaster. */
@@ -568,7 +563,6 @@ PostmasterMain(int argc, char *argv[])
checkDataDir(potential_DataDir); /* issues error messages */
SetDataDir(potential_DataDir);
SetXLogDir(potential_XLogDir);
ProcessConfigFile(PGC_POSTMASTER);