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

2Release 4.0 29178dfa8dbe #6

Merged
merged 20 commits into from
Aug 31, 2020
Merged

2Release 4.0 29178dfa8dbe #6

merged 20 commits into from
Aug 31, 2020

Conversation

hanfei1991
Copy link
Collaborator

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary:

What is changed and how it works?

Proposal: xxx

What's Changed:

How it Works:

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • PR to update pingcap/tidb-ansible:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note

ti-srebot and others added 20 commits August 18, 2020 16:24
@ti-srebot
cherry pick pingcap#18825 to release-4.0 (pingcap#19093)
e10bd72
@ti-srebot @lzmhhh123 @jebter
types: fix wrong hash key for decimal (pingcap#19131) (pingcap#19188)
d890499 
* cherry pick pingcap#19131 to release-4.0

Signed-off-by: ti-srebot <[email protected]>

* fix conflicts

Co-authored-by: Zhuomin(Charming) Liu <[email protected]>
Co-authored-by: jebter <[email protected]>
@ti-srebot @wshwsh12
util: create the tmpdir if the directory is removed by mistake. (ping…
a113adf 
…cap#18970) (pingcap#19272)

* cherry pick pingcap#18970 to release-4.0

Signed-off-by: ti-srebot <[email protected]>

* fix cherry-pick

* remove useless line

Co-authored-by: Shenghui Wu <[email protected]>
@ichn-hu @ti-srebot
Fix error result union scan with apply (pingcap#19245)
c15a405 
* fix union scan

* fix fmt

* Update union_scan.go

Recursively close children.

* Update union_scan.go

Co-authored-by: ti-srebot <[email protected]>
@ti-srebot
ddl: fix db charset modification panic in an uppercase schema (pingca…
e8bbaf4 
…p#19286) (pingcap#19302)

Signed-off-by: ti-srebot <[email protected]>
@overvenus @coocood @sre-bot
*: cherry-pick pingcap#17964 and update pd to v4.0.4 (pingcap#19105)
c5b7658 
* test: fix data race caused by update global config (pingcap#17964)

Co-authored-by: pingcap-github-bot <[email protected]>
Signed-off-by: Neil Shen <[email protected]>

* fix make dev

Signed-off-by: Neil Shen <[email protected]>

* update kvproto and pd

Signed-off-by: Neil Shen <[email protected]>

Co-authored-by: Evan Zhou <[email protected]>
Co-authored-by: pingcap-github-bot <[email protected]>
@ti-srebot
planner: make single partition table support index join on inner side (…
fb95293 
…pingcap#19151) (pingcap#19197)

Signed-off-by: ti-srebot <[email protected]>
@ti-srebot @xhebox @bb7133
ddl: improve compatibility for ALTER TABLE algorithms (pingcap#19270) (…
829c8a7 
…pingcap#19364)

* cherry pick pingcap#19270 to release-4.0

Signed-off-by: ti-srebot <[email protected]>

* fix conflict

Co-authored-by: xhe <[email protected]>
Co-authored-by: bb7133 <[email protected]>
@ti-srebot @sweelim20
cherry pick pingcap#19373 to release-4.0 (pingcap#19378)
61f1150 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Swee <[email protected]>
@ti-srebot
range: build right range for NULL value on index column (pingcap#19385
7d6fd41 
) (pingcap#19430)

Signed-off-by: ti-srebot <[email protected]>
@ti-srebot
executor: fix index join error when join key is ENUM or SET (pingcap#…
3fe0255 
…19235) (pingcap#19415)

Signed-off-by: ti-srebot <[email protected]>
@ti-srebot @eurekaka
cherry pick pingcap#19259 to release-4.0 (pingcap#19403)
3f0740e 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Kenan Yao <[email protected]>
@ti-srebot @SunRunAway
cherry pick pingcap#19316 to release-4.0 (pingcap#19340)
0a26737 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Feng Liyuan <[email protected]>
@ti-srebot
ddl: exit add index on generated column with case-when expression p…
f22dc78 
…arse error (pingcap#19330) (pingcap#19395)
@ti-srebot
executor: reset kvRange in TableReaderExec.Close (pingcap#19447) (pin…
9c1c212 
…gcap#19470)

Signed-off-by: ti-srebot <[email protected]>
@ti-srebot @eurekaka
cherry pick pingcap#19472 to release-4.0 (pingcap#19477)
397fce9 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Kenan Yao <[email protected]>
@ti-srebot
planner: check full match of each range for BatchPointGet plan (pingc…
7fe8264 
…ap#19456) (pingcap#19460)

Signed-off-by: ti-srebot <[email protected]>
@ti-srebot @qw4990
executor: fix incorrect results when there is an IndexLookUp under th…
a578272 
…e inner side of an Apply (pingcap#19496) (pingcap#19508)

* cherry pick pingcap#19496 to release-4.0

Signed-off-by: ti-srebot <[email protected]>

* fix CI

Co-authored-by: Yuanjia Zhang <[email protected]>
@ti-srebot
*: use int instead of fmt.Stringer as executor id (pingcap#19207) (pi…
2a166f0 
…ngcap#19279)

Signed-off-by: ti-srebot <[email protected]>
Signed-off-by: crazycs520 <[email protected]>
@hanfei1991
Merge branch 'release-4.0' into release-4.0-29178dfa8dbe
5101090
@hanfei1991 hanfei1991 merged commit 827d4a4 into ti-srebot:release-4.0-29178dfa8dbe Aug 31, 2020
@hanfei1991 hanfei1991 deleted the release-4.0-29178dfa8dbe branch August 31, 2020 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hanfei1991 @ti-srebot @ichn-hu @overvenus