planner: fix a sporadic panic due to the PR pingcap#7684 when using t…

…he prepared plan cache (pingcap#7956)
XuHuaiyu · Dec 26, 2018 · d85ad88 · d85ad88
1 parent c06df05
commit d85ad88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/executor/prepared.go b/executor/prepared.go
@@ -124,6 +124,10 @@ func (e *PrepareExec) Next(ctx context.Context, chk *chunk.Chunk) error {
 	if _, ok := stmt.(ast.DDLNode); ok {
 		return ErrPrepareDDL
 	}
+	err = ResetContextOfStmt(e.ctx, stmt)
+	if err != nil {
+		return err
+	}
 	var extractor paramMarkerExtractor
 	stmt.Accept(&extractor)
 

diff --git a/tidb-server/main.go b/tidb-server/main.go
@@ -393,7 +393,8 @@ func setGlobalVars() {
 	variable.SysVars[variable.TIDBMemQuotaQuery].Value = strconv.FormatInt(cfg.MemQuotaQuery, 10)
 	variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames)
 
-	plannercore.SetPreparedPlanCache(cfg.PreparedPlanCache.Enabled)
+	// For CI environment we default enable prepare-plan-cache.
+	plannercore.SetPreparedPlanCache(config.CheckTableBeforeDrop || cfg.PreparedPlanCache.Enabled)
 	if plannercore.PreparedPlanCacheEnabled() {
 		plannercore.PreparedPlanCacheCapacity = cfg.PreparedPlanCache.Capacity
 	}