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.

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

Merge release-3.0 to release-3.1 #14788

Merged
merged 123 commits into from
Feb 16, 2020
Merged

Conversation

zimulala
Copy link
Contributor

Conflicts:
bindinfo/bind_test.go
bindinfo/handle.go
cmd/explaintest/r/explain_union_scan.result
config/config.go
config/config.toml.example
config/config_test.go
ddl/ddl.go
executor/adapter.go
executor/executor.go
executor/grant_test.go
executor/insert_test.go
go.mod
go.sum
infoschema/builder.go
infoschema/perfschema/tables_test.go
kv/kv.go
meta/autoid/autoid_test.go
meta/autoid/errors.go
metrics/tikvclient.go
planner/core/integration_test.go
planner/core/preprocess.go
planner/core/testdata/plan_normalized_suite_out.json
server/conn.go
session/pessimistic_test.go
sessionctx/stmtctx/stmtctx.go
sessionctx/variable/varsutil_test.go
store/tikv/txn.go
table/table.go
table/tables/partition_test.go
table/tables/tables.go
table/tables/tables_test.go
util/stmtsummary/statement_summary.go
util/stmtsummary/statement_summary_test.go
util/testkit/testkit.go

alivxxx and others added 30 commits November 26, 2019 20:13
@zimulala zimulala added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Feb 14, 2020
@zimulala
Copy link
Contributor Author

PTAL @bb7133 @zz-jason @jackysp

@zimulala
Copy link
Contributor Author

/run-all-tests

Copy link
Member

@winoros winoros left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tests changes lgtm

@zimulala
Copy link
Contributor Author

/run-unit-test

Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bb7133 bb7133 added this to the v3.1.0-rc milestone Feb 14, 2020
@zimulala zimulala added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 14, 2020
Merge branch 'release-3.1' into zimuxia/merge-3.0-to-3.1
@zimulala
Copy link
Contributor Author

zimulala commented Feb 14, 2020

Merge #14537 to this PR, Conflicts:
cmd/explaintest/r/explain_easy.result
cmd/explaintest/r/partition_pruning.result
executor/table_reader.go
infoschema/infoschema.go
planner/core/testdata/plan_suite_out.json

Update files:
planner/core/testdata/integration_suite_out.json
planner/core/testdata/integration_suite_out.json

@lzmhhh123
Copy link
Contributor

/rebuild

tk.MustExec("drop session binding for select * from t where a > 10")
tk.MustIndexLookup("select * from t where a > -1")
tk.MustExec("drop session binding for select * from t where a = 10")
tk.MustContains("select * from t where a = -1", "IndexLookUp")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PTAL @lamxTyler

zz-jason
zz-jason previously approved these changes Feb 14, 2020
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@alivxxx alivxxx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bb7133
Copy link
Member

bb7133 commented Feb 14, 2020

/run-unit-test

@zimulala zimulala added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 14, 2020
@bb7133
Copy link
Member

bb7133 commented Feb 14, 2020

/run-all-tests

2 similar comments
@zimulala
Copy link
Contributor Author

/run-all-tests

@zyxbest
Copy link
Contributor

zyxbest commented Feb 16, 2020

/run-all-tests

@zimulala
Copy link
Contributor Author

/run-unit-test

@zimulala zimulala merged commit 297b11a into pingcap:release-3.1 Feb 16, 2020
@zimulala zimulala deleted the merge-3.0-to-3.1 branch February 16, 2020 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.