aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2008-09-30 13:14:07 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2008-09-30 13:14:07 +0000
commit57a2091013b2600294b8f5012b147447af186076 (patch)
tree2f9286a6fa2d31e605b23f8e2f5e72f695eaf02a
parentef6f3426447d4e0a5901921bfa5876b5e586afdb (diff)
downloadpostgresql-57a2091013b2600294b8f5012b147447af186076.tar.gz
postgresql-57a2091013b2600294b8f5012b147447af186076.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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 57cb6597939..59f304b4381 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-2008, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.4 2008/06/27 01:53:31 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.5 2008/09/30 13:14:07 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -624,6 +624,8 @@ read_post_opts(void)
*arg1 = '\0'; /* terminate so we get only program name */
post_opts = arg1 + 1; /* point past whitespace */
}
+ else
+ post_opts = "";
if (postgres_path == NULL)
postgres_path = optline;
}