diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-09-30 13:14:21 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-09-30 13:14:21 +0000 |
| commit | 38c8ab246bdc7b02e6cc155576e4c95dbd94a846 (patch) | |
| tree | 337371a2690f381cb986475d84a28042c441abff /src | |
| parent | cd311af46ef08b52e03f633e617a346fa3176da0 (diff) | |
Recent patches to pg_ctl broke "pg_ctl restart" for the case where no
command-line options had been given to the postmaster; and just plain
broke it altogether in 8.1 and 8.0. Per report from KaiGai Kohei.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index b2cc19ee880..26ad982f7eb 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.61.2.5 2008/06/27 01:53:09 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.61.2.6 2008/09/30 13:14:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -548,8 +548,13 @@ do_start(void) *arg1 = '\0'; /* terminate so we get only program name */ post_opts = arg1 + 1; /* point past whitespace */ } + else + post_opts = ""; +#ifdef NOT_USED + /* this never actually worked pre-8.2 */ if (postgres_path == NULL) postgres_path = optline; +#endif } else post_opts = optline; |