fix timer again

James Cor · James Cor · commit 1e5983237707 · 2025-11-19T14:20:23.000-08:00
diff --git a/server/handler.go b/server/handler.go
@@ -499,6 +499,9 @@ func (h *Handler) doQuery(
 		r, processedAtLeastOneBatch, err = h.resultForValueRowIter(sqlCtx, c, schema, vr, resultFields, buf, callback, more)
 	} else {
 		r, processedAtLeastOneBatch, err = h.resultForDefaultIter(sqlCtx, c, schema, rowIter, callback, resultFields, more, buf)
+		if err != nil {
+			return remainder, err
+		}
 	}
 	if err != nil {
 		return remainder, err
@@ -977,7 +980,7 @@ func (h *Handler) resultForValueRowIter(ctx *sql.Context, c *mysql.Conn, schema
 	if res != nil {
 		res.Rows = res.Rows[:res.RowsAffected]
 	}
-	return res, processedAtLeastOneBatch, nil
+	return res, processedAtLeastOneBatch, err
 }
 
 // See https://dev.mysql.com/doc/internals/en/status-flags.html

Original file line number	Diff line number	Diff line change
`@@ -499,6 +499,9 @@ func (h *Handler) doQuery(`
`499`	`499`	`r, processedAtLeastOneBatch, err = h.resultForValueRowIter(sqlCtx, c, schema, vr, resultFields, buf, callback, more)`
`500`	`500`	`} else {`
`501`	`501`	`r, processedAtLeastOneBatch, err = h.resultForDefaultIter(sqlCtx, c, schema, rowIter, callback, resultFields, more, buf)`
	`502`	`+ if err != nil {`
	`503`	`+ return remainder, err`
	`504`	`+ }`
`502`	`505`	`}`
`503`	`506`	`if err != nil {`
`504`	`507`	`return remainder, err`
`@@ -977,7 +980,7 @@ func (h Handler) resultForValueRowIter(ctx sql.Context, c *mysql.Conn, schema`
`977`	`980`	`if res != nil {`
`978`	`981`	`res.Rows = res.Rows[:res.RowsAffected]`
`979`	`982`	`}`
`980`		`- return res, processedAtLeastOneBatch, nil`
	`983`	`+ return res, processedAtLeastOneBatch, err`
`981`	`984`	`}`
`982`	`985`
`983`	`986`	`// See https://dev.mysql.com/doc/internals/en/status-flags.html`