diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-21 09:30:36 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-21 09:30:36 +0000 |
| commit | ed1d3f5ecf60be7f8e7aec38657292f2455b4877 (patch) | |
| tree | 933fbca93b8b4f17eeaa3e2d6ad364e236dbbd66 /src/backend/tcop/postgres.c | |
| parent | 2d29f5f59a9007d7e70b49ce8c487afbbb291e32 (diff) | |
| download | postgresql-ed1d3f5ecf60be7f8e7aec38657292f2455b4877.tar.gz postgresql-ed1d3f5ecf60be7f8e7aec38657292f2455b4877.zip | |
Add missing flag reset to ensure subsequent manual cancelation gives correct reason.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 7631efb9363..e034a4e6501 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) |