aboutsummaryrefslogtreecommitdiff
path: root/src/backend/postmaster/postmaster.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-01-04 00:58:01 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-01-04 00:58:01 +0000
commit4fe7a6b51e08ae861d5b5508da695e007ad7a1b4 (patch)
treeb0978cce292331319beb53461a832d00e9f199c1 /src/backend/postmaster/postmaster.c
parentf532a22a8f36ee61f7de601d8d6eda1c73cf3ed8 (diff)
downloadpostgresql-4fe7a6b51e08ae861d5b5508da695e007ad7a1b4.tar.gz
postgresql-4fe7a6b51e08ae861d5b5508da695e007ad7a1b4.zip
Fix erroneous implementation of -s in postmaster.c (the switch doesn't take
an optarg). Add some comments noting that code in three different files has to be kept in sync. Fix erroneous description of -S switch (it sets work_mem not silent_mode), and do some light copy-editing elsewhere in postgres-ref.
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
-rw-r--r--src/backend/postmaster/postmaster.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index dbe835f3d09..2b5e7d1ae0d 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.505.2.1 2007/01/04 00:58:01 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':