diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/main/main.c | 7 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 9 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c index a750cfe9fd9..28ae9ee98db 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.105 2006/10/04 00:29:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.106 2007/01/04 00:57:51 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -258,7 +258,10 @@ startup_hacks(const char *progname) } - +/* + * Help display should match the options accepted by PostmasterMain() + * and PostgresMain(). + */ static void help(const char *progname) { diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index dbe835f3d09..6810a5587ec 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.505 2006/11/30 18:29:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.506 2007/01/04 00:57:51 tgl Exp $ * * NOTES * @@ -415,6 +415,11 @@ PostmasterMain(int argc, char *argv[]) opterr = 1; + /* + * Parse command-line options. CAUTION: keep this in sync with + * tcop/postgres.c (the option sets should not conflict) + * and with the common help() function in main/main.c. + */ while ((opt = getopt(argc, argv, "A:B:c:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:W:-:")) != -1) { switch (opt) @@ -513,7 +518,7 @@ PostmasterMain(int argc, char *argv[]) break; case 's': - SetConfigOption("log_statement_stats", optarg, PGC_POSTMASTER, PGC_S_ARGV); + SetConfigOption("log_statement_stats", "true", PGC_POSTMASTER, PGC_S_ARGV); break; case 'T': diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index f4b5d59d83e..6ddc9cc1caa 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.519 2006/12/08 02:15:07 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.520 2007/01/04 00:57:51 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2756,6 +2756,11 @@ PostgresMain(int argc, char *argv[], const char *username) ctx = PGC_POSTMASTER; gucsource = PGC_S_ARGV; /* initial switches came from command line */ + /* + * Parse command-line options. CAUTION: keep this in sync with + * postmaster/postmaster.c (the option sets should not conflict) + * and with the common help() function in main/main.c. + */ while ((flag = getopt(argc, argv, "A:B:c:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:v:W:y:-:")) != -1) { switch (flag) |