From: Simon Riggs <simon@2ndQuadrant.com>
Date: Thu, 21 Jan 2010 09:30:36 +0000 (+0000)
Subject: Add missing flag reset to ensure subsequent manual cancelation gives correct reason.
X-Git-Tag: REL9_0_ALPHA4~204
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed1d3f5ecf60be7f8e7aec38657292f2455b4877;p=postgresql

Add missing flag reset to ensure subsequent manual cancelation gives correct reason.
---

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 7631efb936..e034a4e650 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.584 2010/01/17 04:27:54 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.585 2010/01/21 09:30:36 sriggs Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2865,6 +2865,7 @@ ProcessInterrupts(void)
 		if (RecoveryConflictPending)
 		{
 			ImmediateInterruptOK = false;	/* not idle anymore */
+			RecoveryConflictPending = false;
 			DisableNotifyInterrupt();
 			DisableCatchupInterrupt();
 			if (DoingCommandRead)