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

expression: fix wrong collation for concat function (#24297) #24301

Merged
merged 8 commits into from
May 26, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 26, 2021

cherry-pick #24297 to release-5.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/24301

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

git push git@github.com:ti-srebot/tidb.git pr/24301:release-5.0-c1518ac72125

What problem does this PR solve?

Issue Number: close #24296

Problem Summary:

use connection charset and collation if function arg has no explicit collation.

Release note

  • fix wrong collation for concat function

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner April 26, 2021 14:44
@ti-srebot ti-srebot requested review from wshwsh12 and removed request for a team April 26, 2021 14:44
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added component/expression size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.0-cherry-pick labels Apr 26, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone Apr 26, 2021
@ti-srebot
Copy link
Contributor Author

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

@tiancaiamao
Copy link
Contributor

/LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 27, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tiancaiamao
  • wjhuang2016

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Apr 27, 2021
@wjhuang2016
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 675f854

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 27, 2021
@wshwsh12 wshwsh12 removed their request for review April 27, 2021 06:41
@xiongjiwei
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot merged commit 11977a2 into pingcap:release-5.0 May 26, 2021
@xiongjiwei
Copy link
Contributor

/run-unit-test

@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.2 Jun 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/expression size/S Denotes a PR that changes 10-29 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/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants