Merge branch 'james/proj' into james/proj3

server/handler.go

@@ -577,12 +577,6 @@ func (h *Handler) resultForDefaultIter(
  }
  }
 
- pollCtx, cancelF := ctx.NewSubContext()
- eg.Go(func() error {
- defer pan2err()
- return h.pollForClosedConnection(pollCtx, c)
- })
-
  wg := sync.WaitGroup{}
  wg.Add(2)
 
@@ -614,6 +608,12 @@ func (h *Handler) resultForDefaultIter(
  }
  })
 
+ pollCtx, cancelF := ctx.NewSubContext()
+ eg.Go(func() error {
+ defer pan2err()
+ return h.pollForClosedConnection(pollCtx, c)
+ })
+
  // Default waitTime is one minute if there is no timeout configured, in which case
  // it will loop to iterate again unless the socket died by the OS timeout or other problems.
  // If there is a timeout, it will be enforced to ensure that Vitess has a chance to

sql/rowexec/rel_iters.go

@@ -165,7 +165,7 @@ func ProjectRow(
  row sql.Row,
 ) (sql.Row, error) {
  var fields = make(sql.Row, len(projections))
- var secondPass = make([]int, 0, len(projections))
+ var secondPass []int
  for i, expr := range projections {
  // Default values that are expressions may reference other fields, thus they must evaluate after all other exprs.
  // Also default expressions may not refer to other columns that come after them if they also have a default expr.