]> granicus.if.org Git - postgresql/commitdiff
Recent patches to pg_ctl broke "pg_ctl restart" for the case where no
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 30 Sep 2008 13:14:21 +0000 (13:14 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 30 Sep 2008 13:14:21 +0000 (13:14 +0000)
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.

src/bin/pg_ctl/pg_ctl.c

index b2cc19ee880defdec6e418a2be06bbb74e8ef8b4..26ad982f7ebc8182da91b7b3750ac053778a7bbc 100644 (file)
@@ -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;