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

parser: revert latin1 as an alias for utf8mb4 #35025

Merged
merged 9 commits into from
May 30, 2022
Merged

parser: revert latin1 as an alias for utf8mb4 #35025

merged 9 commits into from
May 30, 2022

Conversation

Defined2014
Copy link
Contributor

@Defined2014 Defined2014 commented May 30, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #34008

Problem Summary: revert incompatible code

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

revert incompatible implement for latin1

@Defined2014 Defined2014 added the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label May 30, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 30, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • zimulala

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels May 30, 2022
@Defined2014 Defined2014 changed the title parser: revert make latin1 as an alias for utf8mb4 parser: revert latin1 as an alias for utf8mb4 May 30, 2022
@Defined2014 Defined2014 changed the title parser: revert latin1 as an alias for utf8mb4 parser: revert latin1 as an alias for utf8mb4 May 30, 2022
@Defined2014
Copy link
Contributor Author

/run-mysql-test

@sre-bot
Copy link
Contributor

sre-bot commented May 30, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/1edf0c8114bd241f636d1b962003f7ad28267294

zimulala
zimulala reviewed May 30, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

Do we need to revert code like: https://github.com/pingcap/tidb/pull/34386/files#diff-bd80f9ce1ef95b445a539b88b88c45e67a347693503abb18f67426ca6d1beebfR597 and https://github.com/pingcap/tidb/pull/34386/files#diff-7247d139fb76f3689ecc28e0f8a6af75b5667de1382193a4046f72f50fc33cdcR101

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 30, 2022
@Defined2014
Copy link
Contributor Author

Defined2014 commented May 30, 2022 •
edited
Loading

Do we need to revert code like: https://github.com/pingcap/tidb/pull/34386/files#diff-bd80f9ce1ef95b445a539b88b88c45e67a347693503abb18f67426ca6d1beebfR597 and https://github.com/pingcap/tidb/pull/34386/files#diff-7247d139fb76f3689ecc28e0f8a6af75b5667de1382193a4046f72f50fc33cdcR101

Done. Revert first one. The second one is for alter stmt. @zimulala

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 30, 2022
zimulala
zimulala approved these changes May 30, 2022
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 30, 2022
@Defined2014
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 302c301

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 30, 2022
@Defined2014
Copy link
Contributor Author

/run-mysql-test

@Defined2014
Copy link
Contributor Author

/run-mysql-test

@Defined2014
Copy link
Contributor Author

/merge

@Defined2014 Defined2014 mentioned this pull request May 30, 2022
Merged
12 tasks
@hawkingrei
Copy link
Member

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit b7eeb41 into pingcap:master May 30, 2022
@Defined2014 Defined2014 deleted the revert-latin1 branch May 30, 2022 14:04
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 failed

@sre-bot
Copy link
Contributor

sre-bot commented May 30, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test ✅ all 11 tests passed 14 min Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 35 tests passed 30 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 54 sec Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 6 min 45 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 4 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 34 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 25 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 34 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 25 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tangenta tangenta tangenta approved these changes

@zimulala zimulala zimulala approved these changes

@bb7133 bb7133 Awaiting requested review from bb7133

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Defined2014 @ti-chi-bot @sre-bot @hawkingrei @ti-srebot @zimulala @tangenta