Clear stmt_timeout_active if we disable_all_timeouts.

robertmhaas · robertmhaas · commit be42015fcc7f · 2018-02-09T15:48:18.000-05:00
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
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -3912,6 +3912,7 @@ PostgresMain(int argc, char *argv[],
 		 */
 		disable_all_timeouts(false);
 		QueryCancelPending = false; /* second to avoid race condition */
+		stmt_timeout_active = false;
 
 		/* Not reading from the client anymore. */
 		DoingCommandRead = false;
