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

*: fix a bug caused by the wrong collation setting which leads to the wrong result of collation function (#17116) #17231

Merged
merged 8 commits into from
Jul 28, 2020
Merged

*: fix a bug caused by the wrong collation setting which leads to the wrong result of collation function (#17116) #17231

merged 8 commits into from
Jul 28, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 15, 2020

cherry-pick #17116 to release-4.0

What problem does this PR solve?

Issue Number: close #17115

Problem Summary:

  1. We didn't set collation_connection if the collate is illegal.
  2. The result collation of collation function shouldn't use the argument's collation, or it will lead to unreadable binary output if the collation is binary.

What is changed and how it works?

  1. set the collation to default collation according to the charset if it's illegal.
  2. Set the result collation to collation_connection for collation function.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

Release note

  • Fix a bug caused by the wrong collation setting which leads to the wrong result of collation function.

@sre-bot sre-bot requested a review from a team as a code owner May 15, 2020 05:31
@sre-bot
Copy link
Contributor Author

sre-bot commented May 15, 2020

/run-all-tests

@sre-bot sre-bot mentioned this pull request May 15, 2020
Merged
@ghost ghost requested review from SunRunAway and removed request for a team May 15, 2020 05:32
@sre-bot sre-bot requested review from bb7133 and qw4990 May 15, 2020 05:32
@sre-bot sre-bot added this to the 4.0.0-rc.2 milestone May 15, 2020
@wjhuang2016
Copy link
Member

/run-all-tests

@bb7133 bb7133 modified the milestones: 4.0.0-rc.2, v4.0.0-ga May 19, 2020
@SunRunAway SunRunAway modified the milestones: v4.0.0-ga, v4.0.1 May 28, 2020
@bb7133 bb7133 modified the milestones: v4.0.1, v4.0.2 Jun 6, 2020
bb7133
bb7133 reviewed Jun 19, 2020
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@bb7133 bb7133 added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 19, 2020
@zz-jason zz-jason modified the milestones: v4.0.2, v4.0.3 Jun 19, 2020
qw4990
qw4990 reviewed Jul 10, 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
Copy link
Contributor

@qw4990,Thanks for your review.

winoros
winoros approved these changes Jul 14, 2020
View reviewed changes
Copy link
Member

@winoros winoros 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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 14, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 14, 2020
@winoros winoros modified the milestones: v4.0.3, v4.0.4 Jul 15, 2020
@imtbkcat imtbkcat modified the milestones: v4.0.4, v4.0.5 Jul 28, 2020
@zz-jason
Copy link
Member

/merge

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

Your auto merge job has been accepted, waiting for:

  • 18368
  • 17926
  • 17823
  • 18531
  • 18667
  • 18806
  • 18413
  • 18434
  • 18280
  • 18121
  • 18122
  • 18027
  • 18234
  • 18529
  • 18727
  • 18583
  • 18513
  • 17972

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 18280
  • 18121
  • 18122
  • 18027
  • 18234
  • 18529
  • 18727
  • 18583
  • 18513
  • 17972
  • 18692
  • 17988
  • 18683
  • 18159
  • 17863
  • 17823
  • 18531
  • 18413
  • 18434
  • 18280
  • 18121
  • 18122
  • 18027
  • 18234
  • 18529
  • 18727
  • 18583
  • 18513
  • 17972

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 949fa1a into pingcap:release-4.0 Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 left review comments

@bb7133 bb7133 bb7133 left review comments

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

@winoros winoros winoros approved these changes

@SunRunAway SunRunAway Awaiting requested review from SunRunAway

Assignees

@wjhuang2016 wjhuang2016

Labels
component/expression sig/execution SIG execution 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. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.5
Development

Successfully merging this pull request may close these issues.
9 participants
@sre-bot @wjhuang2016 @ti-srebot @zz-jason @bb7133 @qw4990 @winoros @SunRunAway @imtbkcat