diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-08-17 15:12:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-08-17 15:12:07 +0000 |
| commit | d04e9137c9fe440a0149738dd717b4fb8c63a60a (patch) | |
| tree | afd4c8f0985d645bf4524e426c07c8764d2f410b /src/backend/bootstrap/bootstrap.c | |
| parent | 7c02c86d0fde8d03a56cb1273b2429f3e9a7192b (diff) | |
| download | postgresql-d04e9137c9fe440a0149738dd717b4fb8c63a60a.tar.gz postgresql-d04e9137c9fe440a0149738dd717b4fb8c63a60a.zip | |
Reverse out XLogDir/-X write-ahead log handling, per discussion.
Original patch from Thomas.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index d2afa647688..ae4a86d1d42 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.137 2002/08/10 20:29:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.138 2002/08/17 15:12:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -222,7 +222,6 @@ BootstrapMain(int argc, char *argv[]) int flag; int xlogop = BS_XLOG_NOP; char *potential_DataDir = NULL; - char *potential_XLogDir = NULL; /* * initialize globals @@ -249,22 +248,17 @@ BootstrapMain(int argc, char *argv[]) if (!IsUnderPostmaster) { InitializeGUCOptions(); - /* Null if no PGDATA variable */ - potential_DataDir = getenv("PGDATA"); - /* Null if no PGXLOG variable */ - potential_XLogDir = getenv("PGXLOG"); + potential_DataDir = getenv("PGDATA"); /* Null if no PGDATA + * variable */ } - while ((flag = getopt(argc, argv, "B:d:D:X:Fo:px:")) != -1) + while ((flag = getopt(argc, argv, "B:d:D:Fo:px:")) != -1) { switch (flag) { case 'D': potential_DataDir = optarg; break; - case 'X': - potential_XLogDir = optarg; - break; case 'd': { /* Turn on debugging for the bootstrap process. */ @@ -319,7 +313,6 @@ BootstrapMain(int argc, char *argv[]) proc_exit(1); } SetDataDir(potential_DataDir); - SetXLogDir(potential_XLogDir); } /* Validate we have been given a reasonable-looking DataDir */ |