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

*: revert 38302 for release 6.5 #39927

Merged
merged 6 commits into from
Dec 15, 2022
Merged

*: revert 38302 for release 6.5 #39927

merged 6 commits into from
Dec 15, 2022

Conversation

wjhuang2016
Copy link
Member

@wjhuang2016 wjhuang2016 commented Dec 14, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #39915

Problem Summary:
Revert #38302 for release 6.5.

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.

None

zimulala and others added 3 commits December 13, 2022 21:01
@zimulala @wjhuang2016
ddl: handle ErrNotOwner properly for modify column (pingcap#39645)
426410f 
close pingcap#39643, close pingcap#39644
@wjhuang2016
done
7c0c43e 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
refine
19bf3fe 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 14, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Benjamin2037
  • mjonss

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. do-not-merge/cherry-pick-not-approved size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 14, 2022
@wjhuang2016
refine
68f0e80 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 14, 2022
Benjamin2037
Benjamin2037 approved these changes Dec 14, 2022
View reviewed changes
Copy link
Collaborator

@Benjamin2037 Benjamin2037 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 Dec 14, 2022
mjonss
mjonss approved these changes Dec 14, 2022
View reviewed changes
Copy link
Contributor

@mjonss mjonss 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 Dec 14, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 14, 2022
@tangenta
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 36d205ac60952c7ac42fc79c37d04f7c6f48238a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 14, 2022
bb7133
bb7133 approved these changes Dec 14, 2022
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

@Defined2014
Copy link
Contributor

/run-unit-test

1 similar comment
@hawkingrei
Copy link
Member

/run-unit-test

@Defined2014
Copy link
Contributor

Seems TestAlterModifyColumnOnPartitionedTableFail test failed. @wjhuang2016

@wjhuang2016
Copy link
Member Author

/run-unit-test

@ti-chi-bot
Copy link
Member

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

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.

@Benjamin2037
Copy link
Collaborator

/run-unit-test

@wjhuang2016
fix
343814b 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
Merge branch 'release-6.5' of github.com:pingcap/tidb into revert_mod…
f78eb6e 
…ify_column_par
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 15, 2022
@wjhuang2016
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f78eb6e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 15, 2022
@ti-chi-bot ti-chi-bot merged commit ed33fde into pingcap:release-6.5 Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

@mjonss mjonss mjonss approved these changes

@bb7133 bb7133 bb7133 approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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.
10 participants
@wjhuang2016 @ti-chi-bot @tangenta @Defined2014 @hawkingrei @Benjamin2037 @bb7133 @mjonss @sre-bot @zimulala