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

executor: fix 2nd index dup check after insert ignore on dup update primary (#23814) #23826

Merged
merged 2 commits into from
Apr 14, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 2, 2021

cherry-pick #23814 to release-5.0
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/23826

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

git push [email protected]:ti-srebot/tidb.git pr/23826:release-5.0-096281ec2f9a

What problem does this PR solve?

Issue Number: close #23809

Problem Summary:

see more detail at

#23809 (comment)

What is changed and how it works?

What's Changed, How it Works:

remove old record if new record can added

Related changes

  • Need to cherry-pick to the release branch 5.0 / 4.0?

Check List

Tests

  • Unit test

Side effects

  • n/a

Release note

  • Fix insert ignore on duplicate may delete wrong record

This change is Reviewable

@ti-srebot ti-srebot requested a review from a team as a code owner April 2, 2021 06:08
@ti-srebot ti-srebot requested review from XuHuaiyu and removed request for a team April 2, 2021 06:08
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution sig/transaction SIG:Transaction size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick labels Apr 2, 2021
@ti-srebot ti-srebot added the type/bugfix This PR fixes a bug. label Apr 2, 2021
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Apr 2, 2021
@ti-srebot
Copy link
Contributor Author

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

@cfzjywxk
Copy link
Contributor

cfzjywxk commented Apr 2, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 2, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • tangenta

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 Apr 2, 2021
@coocood
Copy link
Member

coocood commented Apr 13, 2021

/lgtm

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 13, 2021
@lysu
Copy link
Contributor

lysu commented Apr 14, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: fc8fe51

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2021
@ti-chi-bot ti-chi-bot merged commit b61ccf1 into pingcap:release-5.0 Apr 14, 2021
@lysu lysu deleted the release-5.0-096281ec2f9a branch April 14, 2021 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/transaction SIG:Transaction 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/bugfix This PR fixes a bug. type/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants