server: add connection id for lock keys committer (pingcap#15685)

Afee2019 · Mar 27, 2020 · 78ac219 · 78ac219
1 parent 0d10f91
commit 78ac219
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/executor/executor.go b/executor/executor.go
@@ -945,7 +945,7 @@ func doLockKeys(ctx context.Context, se sessionctx.Context, lockCtx *kv.LockCtx,
 	if err != nil {
 		return err
 	}
-	return txn.LockKeys(ctx, lockCtx, keys...)
+	return txn.LockKeys(sessionctx.SetCommitCtx(ctx, se), lockCtx, keys...)
 }
 
 // LimitExec represents limit executor

diff --git a/sessionctx/context.go b/sessionctx/context.go
@@ -134,7 +134,7 @@ type connIDCtxKeyType struct{}
 // ConnID is the key in context.
 var ConnID = connIDCtxKeyType{}
 
-// SetCommitCtx sets the variables for context before commit a transaction.
+// SetCommitCtx sets connection id into context
 func SetCommitCtx(ctx context.Context, sessCtx Context) context.Context {
 	return context.WithValue(ctx, ConnID, sessCtx.GetSessionVars().ConnectionID)
 }