executor: add rollback in releaseSysSession (#14272)

pingcap · Dec 27, 2019 · 8f13cf1 · 8f13cf1
1 parent 6adce23
commit 8f13cf1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/executor/simple.go b/executor/simple.go
@@ -75,8 +75,15 @@ func (e *SimpleExec) getSysSession() (sessionctx.Context, error) {
 }
 
 func (e *SimpleExec) releaseSysSession(ctx sessionctx.Context) {
+	if ctx == nil {
+		return
+	}
 	dom := domain.GetDomain(e.ctx)
 	sysSessionPool := dom.SysSessionPool()
+	if _, err := ctx.(sqlexec.SQLExecutor).Execute(context.Background(), "rollback"); err != nil {
+		ctx.(pools.Resource).Close()
+		return
+	}
 	sysSessionPool.Put(ctx.(pools.Resource))
 }