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

*: fix wrong resource tag of transaction commit statement (#25616) #25706

Merged
merged 4 commits into from
Jul 20, 2021
Merged

*: fix wrong resource tag of transaction commit statement (#25616) #25706

merged 4 commits into from
Jul 20, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 23, 2021 •
edited
Loading

cherry-pick #25616 to release-5.1
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/25706

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

git push git@github.com:ti-srebot/tidb.git pr/25706:release-5.1-ddfc0bd8cf3a

Signed-off-by: crazycs crazycs520@gmail.com

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary:

What is changed and how it works?

Related PR: #24854

This PR fix wrong resource tag of transaction commit statement.

Related changes

  • N/A

Check List

Tests

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

Side effects

  • N/A

Release note

  • No release note.

@crazycs520 @ti-srebot
cherry pick pingcap#25616 to release-5.1
4e85d15 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Jun 23, 2021
Merged
@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.1-cherry-pick type/bugfix This PR fixes a bug. labels Jun 23, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 2021
@wjhuang2016 wjhuang2016 removed their request for review July 2, 2021 02:33
@zhouqiang-cl zhouqiang-cl added backport-5.1.1 cherry-pick-approved Cherry pick PR approved by release team. labels Jul 20, 2021
@crazycs520
resolve conflict
899ccfc 
Signed-off-by: crazycs <crazycs520@gmail.com>
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 20, 2021
AilinKid
AilinKid reviewed Jul 20, 2021
View reviewed changes
Copy link
Contributor

@AilinKid AilinKid 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 Jul 20, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • wjhuang2016

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 20, 2021
@crazycs520
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4f1fafa

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 20, 2021
@ti-chi-bot
Copy link
Member

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

At the same time I will also trigger all tests for you:

/run-all-tests

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.

@crazycs520
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot merged commit 8e6c2e0 into pingcap:release-5.1 Jul 20, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.1.1 milestone Jul 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid approved these changes

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

@jackysp jackysp Awaiting requested review from jackysp

Assignees

@crazycs520 crazycs520

Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/sql-infra SIG: SQL Infra size/S Denotes a PR that changes 10-29 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.1-cherry-pick
Projects
None yet
Milestone
v5.1.1
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @ti-chi-bot @crazycs520 @AilinKid @wjhuang2016 @zhouqiang-cl