database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Remove unnecessary, inconsistent flag resets in ProcessInterrupts.

Browse Source
This commit is contained in:
Tom Lane 2010-01-17 04:27:54 +00:00
parent 1db098974c
commit 0ae19c11f4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.583 2010/01/16 10:05:50 sriggs Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.584 2010/01/17 04:27:54 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -2867,23 +2867,15 @@ ProcessInterrupts(void)
ImmediateInterruptOK = false; /* not idle anymore */ ImmediateInterruptOK = false; /* not idle anymore */
DisableNotifyInterrupt(); DisableNotifyInterrupt();
DisableCatchupInterrupt(); DisableCatchupInterrupt();
if (DoingCommandRead) if (DoingCommandRead)
{
ProcDiePending = false;
QueryCancelPending = false;
ereport(FATAL, ereport(FATAL,
(errcode(ERRCODE_ADMIN_SHUTDOWN), (errcode(ERRCODE_ADMIN_SHUTDOWN),
errmsg("terminating connection due to conflict with recovery"))); errmsg("terminating connection due to conflict with recovery")));
}
else else
{
QueryCancelPending = false;
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_QUERY_CANCELED), (errcode(ERRCODE_QUERY_CANCELED),
errmsg("canceling statement due to conflict with recovery"))); errmsg("canceling statement due to conflict with recovery")));
} }
}
/* /*
* If we are reading a command from the client, just ignore the * If we are reading a command from the client, just ignore the