Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit be42015

Browse files
committed
Clear stmt_timeout_active if we disable_all_timeouts.
Otherwise, we can end up with the flag set when the timeout is actually disabled, leading to misbehavior. Commit f8e5f15 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 parent 958e20e commit be42015

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/backend/tcop/postgres.c

+1
Original file line numberDiff line numberDiff line change
@@ -3912,6 +3912,7 @@ PostgresMain(int argc, char *argv[],
39123912
*/
39133913
disable_all_timeouts(false);
39143914
QueryCancelPending = false; /* second to avoid race condition */
3915+
stmt_timeout_active = false;
39153916

39163917
/* Not reading from the client anymore. */
39173918
DoingCommandRead = false;

0 commit comments

Comments
 (0)