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

*: fix a bug that collation does not work for enum and set #17635

Merged
merged 11 commits into from
Jun 5, 2020

Conversation

wjhuang2016
Copy link
Member

@wjhuang2016 wjhuang2016 commented Jun 3, 2020

What problem does this PR solve?

Issue Number: close #17634

Problem Summary:

In convertToMysqlEnum and convertToMysqlSet, we didn't consider collation and used ToLower.

What is changed and how it works?

Use collator to compare.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

Release note

  • Fix a bug that collation does not work for enum and set.

Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@sre-bot
Copy link
Contributor

sre-bot commented Jun 3, 2020

@wjhuang2016
Copy link
Member Author

/rebuild

Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@codecov
Copy link

codecov bot commented Jun 3, 2020

Codecov Report

Merging #17635 into master will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #17635   +/-   ##
===========================================
  Coverage   79.4724%   79.4724%           
===========================================
  Files           524        524           
  Lines        141142     141142           
===========================================
  Hits         112169     112169           
  Misses        19914      19914           
  Partials       9059       9059           

@wjhuang2016
Copy link
Member Author

/run-unit-test

1 similar comment
@wjhuang2016
Copy link
Member Author

/run-unit-test

Copy link
Contributor

@crazycs520 crazycs520 left a comment

Choose a reason for hiding this comment

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

LGTM

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

@wjhuang2016 wjhuang2016 added the status/can-merge Indicates a PR has been approved by a committer. label Jun 4, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Jun 4, 2020

Your auto merge job has been accepted, waiting for:

  • 17667

@sre-bot
Copy link
Contributor

sre-bot commented Jun 4, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Jun 4, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Jun 4, 2020

@wjhuang2016 merge failed.

@wjhuang2016
Copy link
Member Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Jun 5, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Jun 5, 2020

@wjhuang2016 merge failed.

@wjhuang2016
Copy link
Member Author

/run-common-test

@wjhuang2016
Copy link
Member Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Jun 5, 2020

Your auto merge job has been accepted, waiting for:

  • 17368

@sre-bot
Copy link
Contributor

sre-bot commented Jun 5, 2020

/run-all-tests

@sre-bot sre-bot merged commit 09af066 into pingcap:master Jun 5, 2020
sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Jun 5, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Jun 5, 2020

cherry pick to release-4.0 in PR #17701

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression sig/sql-infra SIG: SQL Infra status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some string value can't insert to the column of SET type
4 participants