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

Merge release 3.0 into release 3.1 #15414

Merged
merged 148 commits into from
Mar 17, 2020
Merged

Merge release 3.0 into release 3.1 #15414

merged 148 commits into from
Mar 17, 2020

Conversation

lonng
Copy link
Contributor

@lonng lonng commented Mar 16, 2020

Unmerged paths:
(use "git add ..." to mark resolution)

    both modified:   bindinfo/bind_test.go
    both modified:   cmd/explaintest/r/explain_easy.result
    both added:      cmd/explaintest/r/explain_union_scan.result
    both modified:   cmd/explaintest/r/partition_pruning.result
    both modified:   config/config.go
    both modified:   config/config.toml.example
    both modified:   config/config_test.go
    both modified:   ddl/ddl.go
    both modified:   ddl/ddl_api.go
    both modified:   executor/grant.go
    both modified:   executor/insert_test.go
    both modified:   executor/show.go
    both modified:   executor/simple.go
    both modified:   executor/table_reader.go
    both modified:   executor/write.go
    both added:      expression/testdata/partition_pruner_out.json
    both modified:   go.mod
    both modified:   go.sum
    both modified:   infoschema/builder.go
    both modified:   infoschema/infoschema.go
    both modified:   infoschema/perfschema/tables_test.go
    both modified:   infoschema/slow_log.go
    both modified:   infoschema/tables.go
    both modified:   infoschema/tables_test.go
    both modified:   meta/autoid/autoid.go
    both modified:   meta/autoid/autoid_test.go
    both modified:   meta/autoid/errors.go
    both modified:   planner/core/explain.go
    both modified:   planner/core/integration_test.go
    both modified:   planner/core/planbuilder.go
    both added:      planner/core/testdata/plan_normalized_suite_out.json
    both modified:   planner/core/testdata/plan_suite_out.json
    both modified:   privilege/privileges/cache.go
    both modified:   privilege/privileges/cache_test.go
    both modified:   server/http_handler.go
    both modified:   server/server.go
    both modified:   session/session_test.go
    both modified:   sessionctx/variable/varsutil.go
    both modified:   sessionctx/variable/varsutil_test.go
    both modified:   store/mockstore/mocktikv/mvcc_leveldb.go
    both modified:   store/tikv/2pc.go
    both modified:   store/tikv/region_request.go
    both modified:   store/tikv/txn.go
    both modified:   table/table.go
    both modified:   table/tables/partition_test.go
    both modified:   table/tables/tables.go
    both modified:   table/tables/tables_test.go
    both modified:   util/execdetails/execdetails.go
    both modified:   util/misc.go
    both modified:   util/mock/context.go
    both modified:   util/stmtsummary/statement_summary.go

alivxxx and others added 30 commits November 26, 2019 20:13
@alivxxx @ngaut
planner/core: fix not null flag for using and natural join (#13735) (#…
e8e0fe9 
…13739)
@Deardrops @ngaut
expression: fix the corner case of CAST int as unsigned real/decimal (#…
bcf2f07 
…13637) (#13755)
@sre-bot @ngaut
expression : fix function 'binSearch' in builtinIntervalRealSig not r…
1db38d5 
…eturn error (#12957) (#13767)
@sre-bot @ngaut
fix single (#13563)
159c16d
@sre-bot @bb7133
types: Fix potential timezone related bugs caused by gotime.Local (#…
16781a3 
…13752) (#13793)
@coocood @sre-bot
store/tikv: fix lockTTL too large if local time is behind timestamp (#…
84e4386 
…13868)
@zimulala
ddl: update the error message of "modify/change column" to make it ea…
599d1c4 
…sier to understand (#13457) (#13796)
@sre-bot
executor: fix data race in TestFastAnalyze (#12910) (#13872)
ab73fde
@sre-bot
privilege: using system session to execute internal sql of RBAC (#13820…
251574b 
…) (#13890)
@reafans @sre-bot
config: add configuration entry make TiDB version string configurable (…
b6a30b8 
…#13775) (#13906)
@crazycs520 @zimulala
*: support split partition table region (#12213) (#13929)
050a356
@jackysp @sre-bot
*: wait for binlog recovering when using HTTP API (#13740) (#13892)
0201879
@sre-bot
privilege: fix privilege check of GRANT ROLE (#13896) (#13932)
cfbe06a
@tiancaiamao @sre-bot
planner/core: raise 'No database selected' error for grant statement (#…
c1624d8 
…13745) (#13784)
@sre-bot
executor: fix inconsistent of grants privileges with MySQL when execu…
e4bcdd4 
…ting `grant all on ...` (#12330) (#13943)
@cfzjywxk @sre-bot
executor: report error in AddRecordLD function (#13980)
e329379
@jackysp @sre-bot
*: do not start slow-log timer before parsing (#13846) (#13898)
9da133f
@alivxxx @eurekaka
bindinfo: fix bindinfo bugs when update cache (#13875) (#13891)
d006af9
@cfzjywxk @sre-bot
executor: change pessimistic lock wait start for one statement (#13990)
969a020
@Deardrops @sre-bot
planner: fixup some bugs with DEFAULT expression (#13168)(#13211)(#…
cba3e1a 
…12550)(#11901) (#13682)
@jackysp
session: if txn invalid do not active it and return an error (#13935) (…
35159fe 
…#13988)
@alivxxx @sre-bot
types: fix insert error when convert string to float (#13716) (#14011)
ce88d7b
@sre-bot
privilege: fix REVOKE privilege check incompatibility with MySQL (#…
3a10bb8 
…13014) (#13306)
@sre-bot
store/tikv: fix a memory leak in the batchClient for the large transa…
b10d1a5 
…ctions (#14031) (#14032)
@alivxxx @sre-bot
stats: remove the lower bound of auto analyze ratio (#13995) (#14015)
c31b745
@SunRunAway @sre-bot
bindinfo, planner: fix sql bind when sql has symbol list (#13889) (#1…
be7cb4d 
…4004)
@sre-bot @bb7133
ddl: fix index length calculation (#13779)
d312f8a
@coocood @sre-bot
*: lock unchanged rows for pessimistic transaction (#14045) (#14050)
13b945d
@sre-bot
mocktikv: add the missing ConflictCommitTS (#14064) (#14080)
b9ba3ef
@winoros @sre-bot
executor: init the final recv channel of hash agg with enough chunk (#…
5d5b071 
…13811) (#13951)
sre-bot and others added 15 commits March 6, 2020 10:31
@sre-bot
server: support check the "CommanName" of tls-cert for status-port(ht…
11ec003 
…tp/grpc) (#15137) (#15164)
@tiancaiamao
*: fix a bug that the pessimistic lock doesn't work on a partition (#…
bd70523 
…14921) (#15114)
@jackysp
store: fix timing of prewrite binlog in slow log (#15273) (#15276)
e4b30a4
@sre-bot
ddl: fix the error message of too long key (#15127) (#15130)
90012b9
@sre-bot
store: check constraint for "Delete-Your-Writes" records when txn com…
3d41a61 
…mit (#14968) (#15176)
@sre-bot
ddl: add a channel to limit multiple DDL jobs writing at the same time (
315b9f2 
#14342) (#15148)
@sre-bot
server: fix tls setup and error log (#15287) (#15292)
051a873
@sre-bot
expression: fix decimal of function FROM_UNIXTIME (#14936) (#15270)
bf82a71
@jackysp
server: stop the server when writing binlog failed (#15324) (#15339)
8c4696b
@sre-bot
executor: use deep copy for maxMin4JSON (#15242) (#15289)
b6c97b7
@sre-bot
infoschema, planner: fix wrong table_names in statement summary (#1…
2ea2b8c 
…5228) (#15231)
@sre-bot
expression: fix behavior for CASE WHEN (not_int) (#15309) (#15359)
9855c8f
@sre-bot
privilege: fix compatibility of DBIsVisible (#14862) (#14939)
7026c86
@XuHuaiyu
planner, executor: adjustOverlongColName for CreateView (#1485… (#14873)
3400fe5
@lonng
Merge remote-tracking branch 'origin/release-3.0' into release-3.1
f207a3e
@github-actions github-actions bot added component/config sig/sql-infra SIG: SQL Infra sig/execution SIG execution sig/planner SIG: Planner labels Mar 16, 2020
@bb7133
Copy link
Member

bb7133 commented Mar 17, 2020

/run-unit-test /run-check_dev

@lonng
Copy link
Contributor Author

lonng commented Mar 17, 2020

/rebuild

@lonng
Copy link
Contributor Author

lonng commented Mar 17, 2020

/run-all-tests

@lonng
fix ci
3d87d9f 
Signed-off-by: Lonng <heng@lonng.org>
@lonng lonng added this to the v3.1.0-rc milestone Mar 17, 2020
@lonng
Copy link
Contributor Author

lonng commented Mar 17, 2020

/run-all-tests

bb7133
bb7133 reviewed Mar 17, 2020
View reviewed changes
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

zimulala
zimulala approved these changes Mar 17, 2020
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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 merged commit f7e6943 into pingcap:release-3.1 Mar 17, 2020
@lonng lonng deleted the release-3.1 branch March 17, 2020 06:24
@lysu lysu mentioned this pull request Mar 17, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 left review comments

@zimulala zimulala zimulala approved these changes

Assignees
No one assigned
Labels
component/config sig/execution SIG execution sig/planner SIG: Planner sig/sql-infra SIG: SQL Infra
Projects
None yet
Milestone
v3.1.0-rc
Development

Successfully merging this pull request may close these issues.