*: Revert #33519 for performance fallback and fix the #33509 in anoth…

…er way (#34425) (#34432) close #33509
pingcap · Jun 15, 2022 · d4f1d2d · d4f1d2d
1 parent 0cbc12b
commit d4f1d2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/planner/core/common_plans.go b/planner/core/common_plans.go
@@ -281,6 +281,7 @@ func (e *Execute) OptimizePreparedPlan(ctx context.Context, sctx sessionctx.Cont
 		// schema version like prepared plan cache key
 		prepared.CachedPlan = nil
 		preparedObj.Executor = nil
+		preparedObj.ColumnInfos = nil
 		// If the schema version has changed we need to preprocess it again,
 		// if this time it failed, the real reason for the error is schema changed.
 		// Example:

diff --git a/session/session.go b/session/session.go
@@ -1924,6 +1924,7 @@ func (s *session) IsCachedExecOk(ctx context.Context, preparedStmt *plannercore.
 		is := s.GetInfoSchema().(infoschema.InfoSchema)
 		if prepared.SchemaVersion != is.SchemaMetaVersion() {
 			prepared.CachedPlan = nil
+			preparedStmt.ColumnInfos = nil
 			return false, nil
 		}
 	}