mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
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.
This commit is contained in:
@ -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 */
|
||||
|
Reference in New Issue
Block a user