diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-08-28 18:23:53 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-08-28 18:23:53 +0000 |
commit | 0a00c9a8efe95180d23705d92e67a581828f50ce (patch) | |
tree | 6d03d220f3c855eb330ab193a53c9a34ed58d5dd /src/backend/tcop/postgres.c | |
parent | c66d9ce7741435a6741dcd34d25c58085c0c4240 (diff) | |
download | postgresql-0a00c9a8efe95180d23705d92e67a581828f50ce.tar.gz postgresql-0a00c9a8efe95180d23705d92e67a581828f50ce.zip |
Remove useless code that propagated FrontendProtocol to a backend via a
PostgresMain switch. In point of fact, FrontendProtocol is already set
in a backend process, since ProcessStartupPacket() is executed inside
the backend --- it hasn't been run by the postmaster for many years.
And if it were, we'd still certainly want FrontendProtocol to be set before
we get as far as PostgresMain, so that startup errors get reported in the
right protocol.
-v might have some future use in standalone backends, so I didn't go so
far as to remove the switch outright.
Also, initialize FrontendProtocol to 0 not PG_PROTOCOL_LATEST. The only
likely result of presetting it like that is to mask failure-to-set-it
mistakes.
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r-- | src/backend/tcop/postgres.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 42e7f79f70f..79e5aa94204 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.569 2009/07/31 20:26:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.570 2009/08/28 18:23:53 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -3075,6 +3075,13 @@ PostgresMain(int argc, char *argv[], const char *username) } case 'v': + /* + * -v is no longer used in normal operation, since + * FrontendProtocol is already set before we get here. + * We keep the switch only for possible use in standalone + * operation, in case we ever support using normal FE/BE + * protocol with a standalone backend. + */ if (secure) FrontendProtocol = (ProtocolVersion) atoi(optarg); break; |