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

util, types: don't let SPM be affected by charset (#23161) #23295

Merged
merged 18 commits into from
Jul 12, 2021
Merged

util, types: don't let SPM be affected by charset (#23161) #23295

merged 18 commits into from
Jul 12, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 12, 2021 •
edited
Loading

cherry-pick #23161 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/23295

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/23295:release-4.0-2bea06ed238c

What problem does this PR solve?

Issue Number: close #xxx

Different default charsets in different drivers(or versions) make SQL bind cannot work.
So we don't let SPM be affected by charset.

We add a flag RestoreStringWithoutCharset to control this.

Need to merge parser pr first

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Side effects

Release note

  • don't let SPM be affected by charset

@rebelice @ti-srebot
cherry pick pingcap#23161 to release-4.0
baaf0d6 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Mar 12, 2021
Merged
@ti-srebot ti-srebot added priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/planner SIG: Planner sig/sql-infra SIG: SQL Infra size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/4.0-cherry-pick labels Mar 12, 2021
@ti-chi-bot ti-chi-bot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 12, 2021
@ti-chi-bot ti-chi-bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 12, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 12, 2021
@ti-srebot
Copy link
Contributor Author

@rebelice you're already a collaborator in bot's repo.

eurekaka
eurekaka reviewed Apr 2, 2021
View reviewed changes
Copy link
Contributor

@eurekaka eurekaka left a comment

Choose a reason for hiding this comment

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

@rebelice please resolve conflicts

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 11, 2021
@zhouqiang-cl zhouqiang-cl removed the cherry-pick-approved Cherry pick PR approved by release team. label May 12, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zhouqiang-cl: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@Reminiscent Reminiscent mentioned this pull request Jul 8, 2021
Closed
Reminiscent
Reminiscent reviewed Jul 9, 2021
View reviewed changes
session/bootstrap.go Outdated
@@ -1148,7 +1148,7 @@ type bindInfo struct {
}

func upgradeToVer51(s Session, ver int64) {
if ver >= version51 {
if ver >= version52 {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not version51 here? Rest LGTM

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 9, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 9, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Reminiscent
  • eurekaka

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 12, 2021
@Reminiscent
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 190c6b2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 12, 2021
lzmhhh123
lzmhhh123 reviewed Jul 12, 2021
View reviewed changes
Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

A lot of test cases are failed.

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Jul 12, 2021
@rebelice
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 6034211

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 12, 2021
@ti-chi-bot ti-chi-bot merged commit b9eb721 into pingcap:release-4.0 Jul 12, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.14 Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzmhhh123 lzmhhh123 lzmhhh123 left review comments

@Reminiscent Reminiscent Reminiscent approved these changes

@eurekaka eurekaka eurekaka approved these changes

@qw4990 qw4990 Awaiting requested review from qw4990

Assignees

@rebelice rebelice

Labels
cherry-pick-approved Cherry pick PR approved by release team. priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/planner SIG: Planner sig/sql-infra SIG: SQL Infra size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.14
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @zhouqiang-cl @Reminiscent @rebelice @eurekaka @lzmhhh123