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

This commit is contained in:
Simon Riggs 2010-01-21 09:30:36 +00:00
parent 2d29f5f59a
commit ed1d3f5ecf

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -2865,6 +2865,7 @@ ProcessInterrupts(void)
if (RecoveryConflictPending) if (RecoveryConflictPending)
{ {
ImmediateInterruptOK = false; /* not idle anymore */ ImmediateInterruptOK = false; /* not idle anymore */
RecoveryConflictPending = false;
DisableNotifyInterrupt(); DisableNotifyInterrupt();
DisableCatchupInterrupt(); DisableCatchupInterrupt();
if (DoingCommandRead) if (DoingCommandRead)