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 7631efb9363a84e2320e04442d8418ff5542e96a..e034a4e6501ffd0df71592f55c2037ff6dbca749 100644 (file)
--- 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)