Commitbe42015

committed

Clear stmt_timeout_active if we disable_all_timeouts.

Otherwise, we can end up with the flag set when the timeout isactually disabled, leading to misbehavior. Commitf8e5f15 introduced this bug.Reported by Peter Eisentraut. Analysis and fix by Thomas Munro,tweaked by me.Discussion:http://postgr.es/m/6a909374-2602-7136-8c70-397330a418f3@2ndquadrant.com

1 parent958e20e commitbe42015Copy full SHA for be42015

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3912,6 +3912,7 @@ PostgresMain(int argc, char *argv[],`
`3912`	`3912`	`*/`
`3913`	`3913`	`disable_all_timeouts(false);`
`3914`	`3914`	`QueryCancelPending= false;/* second to avoid race condition */`
	`3915`	`+stmt_timeout_active= false;`
`3915`	`3916`
`3916`	`3917`	`/* Not reading from the client anymore. */`
`3917`	`3918`	`DoingCommandRead= false;`

Comments

(0)