diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-04 00:58:01 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-04 00:58:01 +0000 |
| commit | 4fe7a6b51e08ae861d5b5508da695e007ad7a1b4 (patch) | |
| tree | b0978cce292331319beb53461a832d00e9f199c1 /src/backend/tcop/postgres.c | |
| parent | f532a22a8f36ee61f7de601d8d6eda1c73cf3ed8 (diff) | |
| download | postgresql-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/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 03a3eca6abd..bcb116a50e4 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.518 2006/11/21 20:59:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.518.2.1 2007/01/04 00:58:01 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2757,6 +2757,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) |