1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 03:21:24 +03:00

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.
This commit is contained in:
Tom Lane 2008-09-30 13:14:21 +00:00
parent cd311af46e
commit 38c8ab246b

View File

@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * 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 */ *arg1 = '\0'; /* terminate so we get only program name */
post_opts = arg1 + 1; /* point past whitespace */ post_opts = arg1 + 1; /* point past whitespace */
} }
else
post_opts = "";
#ifdef NOT_USED
/* this never actually worked pre-8.2 */
if (postgres_path == NULL) if (postgres_path == NULL)
postgres_path = optline; postgres_path = optline;
#endif
} }
else else
post_opts = optline; post_opts = optline;