From 0ae19c11f4211a043ee578ee0419d28db9376d29 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 17 Jan 2010 04:27:54 +0000
Subject: [PATCH] Remove unnecessary, inconsistent flag resets in
ProcessInterrupts.
---
src/backend/tcop/postgres.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8d55e3575a0..7631efb9363 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.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
* this is the "main" module of the postgres backend and
@@ -2867,22 +2867,14 @@ ProcessInterrupts(void)
ImmediateInterruptOK = false; /* not idle anymore */
DisableNotifyInterrupt();
DisableCatchupInterrupt();
-
if (DoingCommandRead)
- {
- ProcDiePending = false;
- QueryCancelPending = false;
ereport(FATAL,
(errcode(ERRCODE_ADMIN_SHUTDOWN),
errmsg("terminating connection due to conflict with recovery")));
- }
else
- {
- QueryCancelPending = false;
ereport(ERROR,
(errcode(ERRCODE_QUERY_CANCELED),
errmsg("canceling statement due to conflict with recovery")));
- }
}
/*
--
GitLab