aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2008-09-30 13:14:15 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2008-09-30 13:14:15 +0000
commit9eba4c35e80867a29764306465813358450a0dbe (patch)
tree3e199f205ecfb9c7a002a364b5665e4d151be4ac
parenta36a20aa5223787a74d9c282362403b52dbed6be (diff)
downloadpostgresql-9eba4c35e80867a29764306465813358450a0dbe.tar.gz
postgresql-9eba4c35e80867a29764306465813358450a0dbe.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 ebcbbc7094b..5385a4d2bbb 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-2006, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.74.2.5 2008/06/27 01:53:20 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.74.2.6 2008/09/30 13:14:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -589,6 +589,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;
}