diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-09-30 13:14:28 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-09-30 13:14:28 +0000 |
| commit | c6b808ea8daa3ebf049e0d91c05e05ee7668813f (patch) | |
| tree | c354b27294487afed5ad5c875863a60e7798863d | |
| parent | b0ea4828e46b92ec7fc2615383efed25a05dd4a5 (diff) | |
| download | postgresql-c6b808ea8daa3ebf049e0d91c05e05ee7668813f.tar.gz postgresql-c6b808ea8daa3ebf049e0d91c05e05ee7668813f.zip | |
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.
| -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 12c230e3837..6338c5859ba 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.53.4.6 2008/06/27 01:52:58 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.53.4.7 2008/09/30 13:14:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -546,8 +546,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; |