database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

executor: fix wrong ConnID for query out of memory quota (#47980)

Browse Source 
close pingcap/tidb#47979
This commit is contained in:
Shenghui Wu
2023-10-26 16:02:04 +08:00
committed by GitHub
parent d4b81de2dc
commit fd08ae3ebb
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/executor/executor.go
View File

@ -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

1
pkg/sessionctx/variable/session.go
View File

@ -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 {