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

expression: fix incorrect collation when cast non-string type arg to string type (#19186) #22599

Merged
merged 4 commits into from
Jan 28, 2021
Merged

expression: fix incorrect collation when cast non-string type arg to string type (#19186) #22599

merged 4 commits into from
Jan 28, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jan 28, 2021 •
edited
Loading

cherry-pick #19186 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/22599

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

git push git@github.com:ti-srebot/tidb.git pr/22599:release-4.0-5153a4155a9a

What problem does this PR solve?

Issue Number: close #19189 #19166
Problem Summary:

What is changed and how it works?

  • when non-string type args cast to string type, it should set collation to the origin collation.
  • deriveCoercibilityForScarlarFunc should return CoercibilityIgnorable if all args is null

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix an issue that may get wrong collation result

@xiongjiwei @ti-srebot
cherry pick pingcap#19186 to release-4.0
1c6a268 
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 Jan 28, 2021
Merged
@ti-srebot ti-srebot added component/expression contribution This PR is from a community contributor. sig/sql-infra SIG: SQL Infra type/4.0-cherry-pick labels Jan 28, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Jan 28, 2021
@ti-srebot
Copy link
Contributor Author

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

@qw4990
Copy link
Contributor

qw4990 commented Jan 28, 2021

/run-all-tests

qw4990
qw4990 reviewed Jan 28, 2021
View reviewed changes
Copy link
Contributor

@qw4990 qw4990 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 28, 2021
wjhuang2016
wjhuang2016 reviewed Jan 28, 2021
View reviewed changes
Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 28, 2021
@qw4990 qw4990 merged commit 33fdb15 into pingcap:release-4.0 Jan 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@qw4990 qw4990 qw4990 approved these changes

Assignees

@xiongjiwei xiongjiwei

Labels
component/expression contribution This PR is from a community contributor. sig/sql-infra SIG: SQL Infra status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.11
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-srebot @qw4990 @wjhuang2016 @xiongjiwei