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/tcop/postgres.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/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 5c0a07bfaa9..605f44ba70b 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.282 2002/08/15 16:36:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.283 2002/08/17 15:12:07 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1120,7 +1120,6 @@ PostgresMain(int argc, char *argv[], const char *username) StringInfo parser_input; char *potential_DataDir = NULL; - char *potential_XLogDir = NULL; /* * Catch standard options before doing much else. This even works on @@ -1164,7 +1163,6 @@ PostgresMain(int argc, char *argv[], const char *username) { InitializeGUCOptions(); potential_DataDir = getenv("PGDATA"); - potential_XLogDir = getenv("PGXLOG"); } /* ---------------- @@ -1189,7 +1187,7 @@ PostgresMain(int argc, char *argv[], const char *username) ctx = PGC_POSTMASTER; gucsource = PGC_S_ARGV; /* initial switches came from command line */ - while ((flag = getopt(argc, argv, "A:B:c:CD:X:d:Eef:FiNOPo:p:S:st:v:W:x:-:")) != -1) + while ((flag = getopt(argc, argv, "A:B:c:CD:d:Eef:FiNOPo:p:S:st:v:W:x:-:")) != -1) switch (flag) { case 'A': @@ -1221,11 +1219,6 @@ PostgresMain(int argc, char *argv[], const char *username) potential_DataDir = optarg; break; - case 'X': /* PGXLOG directory */ - if (secure) - potential_XLogDir = optarg; - break; - case 'd': /* debug level */ { /* Set server debugging level. */ @@ -1517,7 +1510,6 @@ PostgresMain(int argc, char *argv[], const char *username) proc_exit(1); } SetDataDir(potential_DataDir); - SetXLogDir(potential_XLogDir); } Assert(DataDir); @@ -1674,7 +1666,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.282 $ $Date: 2002/08/15 16:36:05 $\n"); + puts("$Revision: 1.283 $ $Date: 2002/08/17 15:12:07 $\n"); } /* |