From db8ab584e1c7824137470e47333160fc6145be1a Mon Sep 17 00:00:00 2001
From: Evan Zhou <coocood@gmail.com>
Date: Wed, 1 Apr 2020 19:53:01 +0800
Subject: [PATCH] executor: do not log slow query for pessimistic write
 conflict retry (#15890) (#15933) (#15936)

---
 executor/adapter.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/executor/adapter.go b/executor/adapter.go
index 994ce3ac74667..073a7bfcb0099 100644
--- a/executor/adapter.go
+++ b/executor/adapter.go
@@ -375,25 +375,20 @@ func (a *ExecStmt) handlePessimisticSelectForUpdate(ctx context.Context, e Execu
 }
 
 func (a *ExecStmt) runPessimisticSelectForUpdate(ctx context.Context, e Executor) (sqlexec.RecordSet, error) {
-	rs := &recordSet{
-		executor: e,
-		stmt:     a,
-	}
 	defer func() {
-		terror.Log(rs.Close())
+		terror.Log(e.Close())
 	}()
-
 	var rows []chunk.Row
 	var err error
-	fields := rs.Fields()
-	req := rs.NewChunk()
+	req := newFirstChunk(e)
 	for {
-		err = rs.Next(ctx, req)
+		err = Next(ctx, e, req)
 		if err != nil {
 			// Handle 'write conflict' error.
 			break
 		}
 		if req.NumRows() == 0 {
+			fields := schema2ResultFields(e.Schema(), a.Ctx.GetSessionVars().CurrentDB)
 			return &chunkRowRecordSet{rows: rows, fields: fields, e: e}, nil
 		}
 		iter := chunk.NewIterator4Chunk(req)