cleanup

James Cor · James Cor · commit d7396b4c6fc4 · 2025-11-19T14:20:35.000-08:00
diff --git a/server/handler.go b/server/handler.go
@@ -926,14 +926,7 @@ func (h *Handler) resultForValueRowIter(ctx *sql.Context, c *mysql.Conn, schema
 				}
 			}
 
-			// timer has gone off
-			if !timer.Reset(waitTime) {
-				if h.readTimeout != 0 {
-					// Cancel and return so Vitess can call the CloseConnection callback
-					ctx.GetLogger().Warn("connection timeout")
-					return ErrRowTimeout.New()
-				}
-			}
+			timer.Reset(waitTime)
 		}
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -926,14 +926,7 @@ func (h Handler) resultForValueRowIter(ctx sql.Context, c *mysql.Conn, schema`
`926`	`926`	`}`
`927`	`927`	`}`
`928`	`928`
`929`		`- // timer has gone off`
`930`		`- if !timer.Reset(waitTime) {`
`931`		`- if h.readTimeout != 0 {`
`932`		`- // Cancel and return so Vitess can call the CloseConnection callback`
`933`		`- ctx.GetLogger().Warn("connection timeout")`
`934`		`- return ErrRowTimeout.New()`
`935`		`- }`
`936`		`- }`
	`929`	`+ timer.Reset(waitTime)`
`937`	`930`	`}`
`938`	`931`	`})`
`939`	`932`