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 "ddl: fix create partition table error under NO_UNSIGNED_SUBTRACTION" (#26935) #27100

Merged
merged 2 commits into from
Oct 12, 2021
Merged

Revert "ddl: fix create partition table error under NO_UNSIGNED_SUBTRACTION" (#26935) #27100

merged 2 commits into from
Oct 12, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 11, 2021 •
edited
Loading

cherry-pick #26935 to release-5.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/27100

After apply modifications, you can push your change to this PR via:

git push [email protected]:ti-srebot/tidb.git pr/27100:release-5.2-bb32631b6af8

Reverts #25435

What problem does this PR solve?

Problem Summary:

the PR introduces a bug #26765, it fixes a corner case but breaks a more common case. I am gonna revert PR #25435 and document the bad case in the issues #24880. see #25437 (comment) for more details.

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 

fix a bug that creates partition fail if `NO_UNSIGNED_SUBTRACTION` is set.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 11, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • xhebox
  • 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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added 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 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. labels Aug 11, 2021
@ti-srebot ti-srebot mentioned this pull request Aug 11, 2021
Merged
12 tasks
@ti-srebot ti-srebot added sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.2-cherry-pick labels Aug 11, 2021
@ti-srebot
Copy link
Contributor Author

@xiongjiwei you're already a collaborator in bot's repo.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 12, 2021
@xhebox
Copy link
Contributor

xhebox commented Sep 8, 2021

Any update?

mjonss
mjonss approved these changes Sep 9, 2021
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
Copy link
Member

@mjonss: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

LGTM

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.

wjhuang2016
wjhuang2016 reviewed Sep 9, 2021
View reviewed changes
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.

Do we really need to cherry-pick this PR?

@qw4990 qw4990 removed their request for review September 23, 2021 03:14
@zimulala
Copy link
Contributor

PTAL @xiongjiwei

@xiongjiwei
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 12, 2021
@xiongjiwei
Copy link
Contributor

Do we really need to cherry-pick this PR?

yes, the behavior in the master is the same as the version before 5.1. it is not friendly for 5.0->5.1->master upgrade

zimulala
zimulala approved these changes Oct 12, 2021
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 Oct 12, 2021
@xiongjiwei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 8536901

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 12, 2021
@xiongjiwei
Copy link
Contributor

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit 5db6f20 into pingcap:release-5.2 Oct 12, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.2.2 milestone Oct 20, 2021
@zimulala zimulala mentioned this pull request Oct 25, 2021
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@zimulala zimulala zimulala approved these changes

@xhebox xhebox xhebox approved these changes

@mjonss mjonss mjonss approved these changes

@bb7133 bb7133 Awaiting requested review from bb7133

Assignees

@xiongjiwei xiongjiwei

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. sig/sql-infra SIG: SQL Infra 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. type/5.2-cherry-pick
Projects
None yet
Milestone
v5.2.2
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @xhebox @zimulala @xiongjiwei @mjonss @wjhuang2016 @zhouqiang-cl