Merge pull request #154584 from yuzefovich/blathers/backport-release-25.4-154492

release-25.4: stmtdiagnostics: fix bizarre flake in TestDiagnosticsRequest

Author: yuzefovich

pkg/sql/stmtdiagnostics/statement_diagnostics_test.go

@@ -173,8 +173,12 @@ func TestDiagnosticsRequest(t *testing.T) {
 		require.True(t, strings.Contains(err.Error(), sqlerrors.QueryTimeoutError.Error()))
 
 		// Reset the stmt timeout so that it doesn't affect the query in
-		// checkCompleted.
-		runner.Exec(t, "RESET statement_timeout;")
+		// checkCompleted. Wrap it in a SucceedsSoon in case RESET query itself
+		// times out.
+		testutils.SucceedsSoon(t, func() error {
+			_, err = db.Exec("RESET statement_timeout;")
+			return err
+		})
 		checkCompleted(reqID)
 	})