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

[hotfix]: cherry-pick 33946, 34538 and 35367 to v5.2.4 #36898

Merged
merged 6 commits into from
Aug 5, 2022
Merged

[hotfix]: cherry-pick 33946, 34538 and 35367 to v5.2.4 #36898

merged 6 commits into from
Aug 5, 2022

Conversation

zimulala
Copy link
Contributor

@zimulala zimulala commented Aug 4, 2022 •
edited by tangenta
Loading

cherry-pick #33946, #34538 and #35367 to v5.2.4

Release note

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

Fix the panic issue when joining information_schema.columns.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 4, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • tiancaiamao

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 4, 2022
@zimulala
Copy link
Contributor Author

zimulala commented Aug 4, 2022

PTAL @tangenta @crazycs520

@zimulala zimulala changed the title [hotfix]: cherry-pick 33946 and 35367 to v5.2.4 [hotfix]: cherry-pick 33946, 34538 and 35367 to v5.2.4 Aug 4, 2022
@zimulala
Copy link
Contributor Author

zimulala commented Aug 4, 2022

PTAL @tangenta @crazycs520 @tiancaiamao

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 4, 2022
tangenta
tangenta previously approved these changes Aug 4, 2022
View reviewed changes
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 4, 2022
@zimulala
Copy link
Contributor Author

zimulala commented Aug 4, 2022

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Aug 4, 2022

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

@zimulala
Copy link
Contributor Author

zimulala commented Aug 4, 2022

/run-mysql-test

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. labels Aug 4, 2022
@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 Aug 5, 2022
@tiancaiamao
Copy link
Contributor

/run-mysql-test

1 similar comment
@zimulala
Copy link
Contributor Author

zimulala commented Aug 5, 2022

/run-mysql-test

@zimulala
Copy link
Contributor Author

zimulala commented Aug 5, 2022

/run-mysql-test tidb-test=release-5.2

@zimulala
Copy link
Contributor Author

zimulala commented Aug 5, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b5ae1a2

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

zimulala commented Aug 5, 2022

/run-mysql-test tidb-test=release-5.2

@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 5, 2022
@ti-chi-bot ti-chi-bot merged commit 62e3cea into pingcap:release-5.2-20220804 Aug 5, 2022
@zimulala zimulala deleted the zimuxia/info-schema-1 branch August 5, 2022 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiancaiamao tiancaiamao tiancaiamao approved these changes

@tangenta tangenta tangenta approved these changes

@crazycs520 crazycs520 crazycs520 approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 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.
6 participants
@zimulala @ti-chi-bot @sre-bot @tiancaiamao @tangenta @crazycs520