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

simonat2ndQuadrant · simonat2ndQuadrant · commit ed1d3f5ecf60 · 2010-01-21T09:30:36.000Z
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.584 2010/01/17 04:27:54 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.585 2010/01/21 09:30:36 sriggs Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2865,6 +2865,7 @@ ProcessInterrupts(void)`
`2865`	`2865`	`if (RecoveryConflictPending)`
`2866`	`2866`	`{`
`2867`	`2867`	`ImmediateInterruptOK = false; /* not idle anymore */`
	`2868`	`+ RecoveryConflictPending = false;`
`2868`	`2869`	`DisableNotifyInterrupt();`
`2869`	`2870`	`DisableCatchupInterrupt();`
`2870`	`2871`	`if (DoingCommandRead)`