aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-10-06 09:38:39 -0400
committerBruce Momjian <bruce@momjian.us>2011-10-06 09:38:39 -0400
commitaaa6e1def292cdacb6b27088898793b1b879fedf (patch)
treec83d11607dbc2d7990137d98bd22bdc7b77ad931 /src/backend/tcop/postgres.c
parent7f3bd86843e5aad84585a57d3f6b80db3c609916 (diff)
downloadpostgresql-aaa6e1def292cdacb6b27088898793b1b879fedf.tar.gz
postgresql-aaa6e1def292cdacb6b27088898793b1b879fedf.zip
Add postmaster -C option to query configuration parameters, and have
pg_ctl use that to query the data directory for config-only installs. This fixes awkward or impossible pg_ctl operation for config-only installs.
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index c7eac71e91e..19d94b252c2 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -3170,7 +3170,7 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx)
* 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:bc:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:v:W:-:")) != -1)
+ while ((flag = getopt(argc, argv, "A:B:bc:C:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:v:W:-:")) != -1)
{
switch (flag)
{
@@ -3187,6 +3187,10 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx)
IsBinaryUpgrade = true;
break;
+ case 'C':
+ /* ignored for consistency with the postmaster */
+ break;
+
case 'D':
if (secure)
userDoption = strdup(optarg);
@@ -3272,7 +3276,7 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx)
break;
case 'T':
- /* ignored for consistency with postmaster */
+ /* ignored for consistency with the postmaster */
break;
case 't':