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

session: improve collation_server handling #24835

Merged
merged 3 commits into from
May 24, 2021

Conversation

morgo
Copy link
Contributor

@morgo morgo commented May 21, 2021

What problem does this PR solve?

Problem Summary:

This revisits #23932 with a simpler fix, which I noticed while performing some other refactoring.

The original problem is that when setting the character_set_server, the collation_server is also set; which leads to the collation no longer being set because it is already set.

Because collation_server also sets the character_set_server, this PR takes the approach of removing the code that sets character_set_server. Both variables will be set with collation_server.

What is changed and how it works?

What's Changed:

Small code improvement, function neutral.

Related changes

Check List

Tests

  • Unit test (covered by existing tests)

Side effects

  • None

Release note

  • No release note

@morgo morgo requested review from xhebox and xiongjiwei May 21, 2021 21:43
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 21, 2021
@morgo morgo added the sig/sql-infra SIG: SQL Infra label May 21, 2021
Copy link
Contributor

@xiongjiwei xiongjiwei 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 24, 2021
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.

After we remove the code that sets character_set_server, if glocal character_set_server is set, session character_set_server will not take effect.

@tiancaiamao
Copy link
Contributor

/LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tiancaiamao
  • xiongjiwei

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 24, 2021
@xhebox
Copy link
Contributor

xhebox commented May 24, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: c2f3bea

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2021
@ti-chi-bot
Copy link
Member

@morgo: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@morgo
Copy link
Contributor Author

morgo commented May 24, 2021

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 0191281 into pingcap:master May 24, 2021
@morgo morgo deleted the collation-server-simplification branch May 24, 2021 03:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants