Fixes from review

Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>

server/handler.go

@@ -21,8 +21,8 @@ import (
 
 var regKillCmd = regexp.MustCompile(`^kill (?:(query|connection) )?(\d+)$`)
 
-var errConnectionNotFound = errors.NewKind("Connection not found: %c")
-var RowTimeout = errors.NewKind("Row read wait bigger than connection timeout")
+var errConnectionNotFound = errors.NewKind("connection not found: %c")
+var ErrRowTimeout = errors.NewKind("row read wait bigger than connection timeout")
 
 // TODO parametrize
 const rowsBatch = 100
@@ -137,7 +137,8 @@ func (h *Handler) ComQuery(
 	if h.readTimeout > 0 {
 		waitTime = h.readTimeout
 	}
-	timer := time.NewTimer(h.readTimeout)
+	timer := time.NewTimer(waitTime)
+	defer timer.Stop()
 
 rowLoop:
 	for {
@@ -172,18 +173,16 @@ rowLoop:
 			r.Rows = append(r.Rows, outputRow)
 			r.RowsAffected++
 		case <-timer.C:
-			if h.readTimeout != 0 && waitTime >= h.readTimeout {
+			if h.readTimeout != 0 {
 				// Return so Vitess can call the CloseConnection callback
-				err = RowTimeout.New()
+				err = ErrRowTimeout.New()
 				close(quit)
 				break rowLoop
 			}
 		}
 		timer.Reset(waitTime)
 	}
 
-	timer.Stop()
-
 	if err != nil {
 		return err
 	}

server/handler_test.go

@@ -272,7 +272,7 @@ func TestHandlerTimeout(t *testing.T) {
 	err := timeOutHandler.ComQuery(connTimeout, "SELECT SLEEP(2)", func(res *sqltypes.Result) error {
 		return nil
 	})
-	require.EqualError(err, "Row read wait bigger than connection timeout")
+	require.EqualError(err, "row read wait bigger than connection timeout")
 
 	err = timeOutHandler.ComQuery(connTimeout, "SELECT SLEEP(0.5)", func(res *sqltypes.Result) error {
 		return nil