diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-07-28 22:05:47 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-07-28 22:05:47 +0000 |
| commit | 98c120a2037391ad1d475b7e3566505ede36cb77 (patch) | |
| tree | 890b0979875b3129a5c86edc70119a48a58dc23f /src/backend/tcop/postgres.c | |
| parent | d79dc61df9af7ce97bbbeb1f7c8a7a89f9874e85 (diff) | |
| download | postgresql-98c120a2037391ad1d475b7e3566505ede36cb77.tar.gz postgresql-98c120a2037391ad1d475b7e3566505ede36cb77.zip | |
Revert ill-conceived patch that made elog(FATAL) the same as elog(ERROR)
followed by seeing EOF from client. If we want a safe session-kill
capability we will need to write one, not break our error handling
mechanism.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index a353122fc26..a8a7e0197ae 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.425 2004/07/27 05:11:03 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.426 2004/07/28 22:05:46 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2932,10 +2932,7 @@ PostgresMain(int argc, char *argv[], const char *username) /* * (3) read a command (loop blocks here) */ - if (!in_fatal_exit) - firstchar = ReadCommand(&input_message); - else - firstchar = EOF; + firstchar = ReadCommand(&input_message); /* * (4) disable async signal conditions again. @@ -3164,8 +3161,7 @@ PostgresMain(int argc, char *argv[], const char *username) * Otherwise it will fail to be called during other * backend-shutdown scenarios. */ - proc_exit(!in_fatal_exit ? 0 : proc_exit_inprogress || - !IsUnderPostmaster); + proc_exit(0); case 'd': /* copy data */ case 'c': /* copy done */ |