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

Merged
merged 5 commits into from
Aug 13, 2020
Merged

expression: fix wrong collation and coercibility #19169

merged 5 commits into from
Aug 13, 2020

Conversation

xiongjiwei
Copy link
Contributor

@xiongjiwei xiongjiwei commented Aug 13, 2020 •
edited
Loading

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

@ti-srebot ti-srebot added the contribution This PR is from a community contributor. label Aug 13, 2020
@xiongjiwei xiongjiwei marked this pull request as ready for review August 13, 2020 06:42
@xiongjiwei xiongjiwei requested a review from a team as a code owner August 13, 2020 06:42
@xiongjiwei xiongjiwei requested review from wshwsh12 and removed request for a team August 13, 2020 06:42
@xiongjiwei
Copy link
Contributor Author

/run-all-tests

wjhuang2016
wjhuang2016 reviewed Aug 13, 2020
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 Aug 13, 2020
qw4990
qw4990 approved these changes Aug 13, 2020
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 Aug 13, 2020
@qw4990
Copy link
Contributor

qw4990 commented Aug 13, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 13, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@xiongjiwei xiongjiwei changed the title fix wrong collation and coercibility expression: fix wrong collation and coercibility Aug 13, 2020
@ti-srebot
Copy link
Contributor

@xiongjiwei merge failed.

@wjhuang2016
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

@wjhuang2016 Oops! auto merge is restricted to Committers of the SIG.See the corresponding SIG page for more information. Related SIGs: execution(slack).

@wjhuang2016 wjhuang2016 merged commit b9e90ef into pingcap:master Aug 13, 2020
@xiongjiwei xiongjiwei deleted the bug-fix-collation branch August 13, 2020 08:29
@xiongjiwei xiongjiwei mentioned this pull request Aug 13, 2020
Closed
@wjhuang2016 wjhuang2016 added the sig/sql-infra SIG: SQL Infra label Aug 28, 2020
@xiongjiwei
Copy link
Contributor Author

/label needs-cherry-pick-4.0

@ti-srebot ti-srebot mentioned this pull request Jan 28, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #22602

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 28, 2021
@xiongjiwei @ti-srebot
cherry pick pingcap#19169 to release-4.0
9e67283 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
qw4990 pushed a commit that referenced this pull request Jan 28, 2021
@ti-srebot
expression: fix wrong collation and coercibility (#19169) (#22602)
f74dd5d
@xiongjiwei xiongjiwei added the type/bugfix This PR fixes a bug. label Oct 13, 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

@ti-srebot ti-srebot ti-srebot approved these changes

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

Assignees
No one assigned
Labels
component/expression contribution This PR is from a community contributor. sig/sql-infra SIG: SQL Infra status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

result of select collation(concat(NULL,NULL)) is wrong
4 participants
@xiongjiwei @qw4990 @ti-srebot @wjhuang2016