From fd08ae3ebb1cf37e6ac0ea6bc8ef3c35cc3e331d Mon Sep 17 00:00:00 2001
From: Shenghui Wu <793703860@qq.com>
Date: Thu, 26 Oct 2023 16:02:04 +0800
Subject: [PATCH] executor: fix wrong ConnID for query out of memory quota
 (#47980)

close pingcap/tidb#47979
---
 pkg/executor/executor.go           | 1 +
 pkg/sessionctx/variable/session.go | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go
index 17c5d70435..b660343f59 100644
--- a/pkg/executor/executor.go
+++ b/pkg/executor/executor.go
@@ -1996,6 +1996,7 @@ func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) {
 	vars.MemTracker.Killer = &vars.SQLKiller
 	vars.DiskTracker.Killer = &vars.SQLKiller
 	vars.SQLKiller.Reset()
+	vars.SQLKiller.ConnID = vars.ConnectionID
 	vars.StmtCtx.TableStats = make(map[int64]interface{})
 
 	isAnalyze := false
diff --git a/pkg/sessionctx/variable/session.go b/pkg/sessionctx/variable/session.go
index 5df93fa0e0..23e7df757c 100644
--- a/pkg/sessionctx/variable/session.go
+++ b/pkg/sessionctx/variable/session.go
@@ -2066,7 +2066,6 @@ func NewSessionVars(hctx HookContext) *SessionVars {
 	vars.DiskTracker = disk.NewTracker(memory.LabelForSession, -1)
 	vars.MemTracker = memory.NewTracker(memory.LabelForSession, vars.MemQuotaQuery)
 	vars.MemTracker.IsRootTrackerOfSess = true
-	vars.SQLKiller.ConnID = vars.ConnectionID
 	vars.MemTracker.Killer = &vars.SQLKiller
 
 	for _, engine := range config.GetGlobalConfig().IsolationRead.Engines {