Commit f1e0044b authored by Tom Lane's avatar Tom Lane

When under postmaster, bogus arguments should cause proc_exit(0) not

proc_exit(1).  Unless you think a system-wide restart is an appropriate
response to bogus PGOPTIONS, that is.
parent 2b0f8ae0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.207 2001/02/18 04:28:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.208 2001/02/24 02:04:51 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -1537,7 +1537,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha ...@@ -1537,7 +1537,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
if (errs || argc != optind || DBName == NULL) if (errs || argc != optind || DBName == NULL)
{ {
fprintf(stderr, "%s: invalid command line arguments\nTry -? for help.\n", argv[0]); fprintf(stderr, "%s: invalid command line arguments\nTry -? for help.\n", argv[0]);
proc_exit(1); proc_exit(0); /* not 1, that causes system-wide restart... */
} }
pq_init(); /* initialize libpq at backend startup */ pq_init(); /* initialize libpq at backend startup */
whereToSendOutput = Remote; whereToSendOutput = Remote;
...@@ -1680,7 +1680,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha ...@@ -1680,7 +1680,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.207 $ $Date: 2001/02/18 04:28:31 $\n"); puts("$Revision: 1.208 $ $Date: 2001/02/24 02:04:51 $\n");
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment