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 wrong collation and coercibility (#19169) #22602

Merged
merged 2 commits into from
Jan 28, 2021
Merged

expression: fix wrong collation and coercibility (#19169) #22602

merged 2 commits into from
Jan 28, 2021

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #19169 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/22602

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

git push git@github.com:ti-srebot/tidb.git pr/22602:release-4.0-b9e90ef61487

What problem does this PR solve?

Issue Number: close #19166

Problem Summary:

What is changed and how it works?

  • change default coercibility in DeriveCollationFromExprs and deriveCoercibilityForScarlarFunc
  • make conv function use connect collation

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix an issue that cause wrong collation and coercibility

@xiongjiwei @ti-srebot
cherry pick pingcap#19169 to release-4.0
9e67283 
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.

@xiongjiwei
Copy link
Contributor

/run-all-tests

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 the status/LGT1 Indicates that a PR has LGTM 1. label Jan 28, 2021
qw4990
qw4990 approved these changes 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 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 f74dd5d 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

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

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 @xiongjiwei @qw4990 @wjhuang2016