This is an automated cherry-pick of pingcap#49399

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Dec 13, 2023 · ee62351 · ee62351
1 parent 859fade
commit ee62351
Show file tree

Hide file tree

Showing 3 changed files with 596 additions and 0 deletions.
diff --git a/session/session.go b/session/session.go
@@ -1259,6 +1259,7 @@ func (s *session) retry(ctx context.Context, maxCnt uint) (err error) {
 		for i, sr := range nh.history {
 			st := sr.st
 			s.sessionVars.StmtCtx = sr.stmtCtx
+			s.sessionVars.StmtCtx.CTEStorageMap = map[int]*executor.CTEStorages{}
 			s.sessionVars.StmtCtx.ResetForRetry()
 			s.sessionVars.PreparedParams = s.sessionVars.PreparedParams[:0]
 			schemaVersion, err = st.RebuildPlan(ctx)