Commit0ae19c1

committed

Remove unnecessary, inconsistent flag resets in ProcessInterrupts.

1 parent1db0989 commit0ae19c1Copy full SHA for 0ae19c1

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 9 deletions

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.583 2010/01/16 10:05:50 sriggs Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.584 2010/01/17 04:27:54 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2867,22 +2867,14 @@ ProcessInterrupts(void)`
`2867`	`2867`	`ImmediateInterruptOK= false;/* not idle anymore */`
`2868`	`2868`	`DisableNotifyInterrupt();`
`2869`	`2869`	`DisableCatchupInterrupt();`
`2870`		`-`
`2871`	`2870`	`if (DoingCommandRead)`
`2872`		`-{`
`2873`		`-ProcDiePending= false;`
`2874`		`-QueryCancelPending= false;`
`2875`	`2871`	`ereport(FATAL,`
`2876`	`2872`	`(errcode(ERRCODE_ADMIN_SHUTDOWN),`
`2877`	`2873`	`errmsg("terminating connection due to conflict with recovery")));`
`2878`		`-}`
`2879`	`2874`	`else`
`2880`		`-{`
`2881`		`-QueryCancelPending= false;`
`2882`	`2875`	`ereport(ERROR,`
`2883`	`2876`	`(errcode(ERRCODE_QUERY_CANCELED),`
`2884`	`2877`	`errmsg("canceling statement due to conflict with recovery")));`
`2885`		`-}`
`2886`	`2878`	`}`
`2887`	`2879`
`2888`	`2880`	`/*`

Comments

(0)