Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

planner: fix a sporadic panic due to the PR #7684 when using the prepared plan cache (#7956) #8826

Merged
merged 2 commits into from
Dec 26, 2018
Merged

planner: fix a sporadic panic due to the PR #7684 when using the prepared plan cache (#7956) #8826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85ad88
planner: fix a sporadic panic due to the PR #7684 when using the prep…
dbjoa Oct 29, 2018
e756778
Merge branch 'release-2.1' into release-2.1
XuHuaiyu Dec 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions executor/prepared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,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)

Expand Down
3 changes: 2 additions & 1 deletion tidb-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,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
}
Expand Down