cherry pick pingcap#15592 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>

distsql/select_result.go

@@ -16,10 +16,12 @@ package distsql
 import (
 	"context"
 	"fmt"
+	"sync/atomic"
 	"time"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/terror"
+	"github.com/pingcap/tidb/errno"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/sessionctx"
@@ -33,6 +35,10 @@ import (
 	"go.uber.org/zap"
 )
 
+var (
+	errQueryInterrupted = terror.ClassExecutor.NewStd(errno.ErrQueryInterrupted)
+)
+
 var (
 	_ SelectResult = (*selectResult)(nil)
 	_ SelectResult = (*streamResult)(nil)
@@ -105,13 +111,37 @@ func (r *selectResult) fetch(ctx context.Context) {
 		var result resultWithErr
 		resultSubset, err := r.resp.Next(ctx)
 		if err != nil {
+<<<<<<< HEAD
 			result.err = err
 		} else if resultSubset == nil {
 			// If the result is drained, the resultSubset would be nil
 			return
 		} else {
 			result.result = resultSubset
 			r.memConsume(int64(resultSubset.MemSize()))
+=======
+			return errors.Trace(err)
+		}
+		r.selectRespSize = r.selectResp.Size()
+		r.memConsume(int64(r.selectRespSize))
+		if err := r.selectResp.Error; err != nil {
+			return terror.ClassTiKV.Synthesize(terror.ErrCode(err.Code), err.Msg)
+		}
+		sessVars := r.ctx.GetSessionVars()
+		if atomic.CompareAndSwapUint32(&sessVars.Killed, 1, 0) {
+			return errors.Trace(errQueryInterrupted)
+		}
+		sc := sessVars.StmtCtx
+		for _, warning := range r.selectResp.Warnings {
+			sc.AppendWarning(terror.ClassTiKV.Synthesize(terror.ErrCode(warning.Code), warning.Msg))
+		}
+		r.updateCopRuntimeStats(resultSubset.GetExecDetails(), resultSubset.RespTime())
+		r.feedback.Update(resultSubset.GetStartKey(), r.selectResp.OutputCounts)
+		r.partialCount++
+		sc.MergeExecDetails(resultSubset.GetExecDetails(), nil)
+		if len(r.selectResp.Chunks) != 0 {
+			break
+>>>>>>> 00dc69c... distsql: check the killed flag in the distsql package (#15592)
 		}
 
 		select {