Skip to content

sql: fix the correctness problem about kill (#6377)#6378

Merged
ti-chi-bot merged 3 commits into
pingcap:release-5.1from
ti-chi-bot:cherry-pick-6377-to-release-5.1
Sep 3, 2021
Merged

sql: fix the correctness problem about kill (#6377)#6378
ti-chi-bot merged 3 commits into
pingcap:release-5.1from
ti-chi-bot:cherry-pick-6377-to-release-5.1

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #6377

Signed-off-by: Weizhen Wang wangweizhen@pingcap.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

fix the correctness problem about kill

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

hawkingrei and others added 3 commits September 3, 2021 02:12
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ti-chi-bot
Copy link
Copy Markdown
Member Author

ti-chi-bot commented Sep 3, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

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.

Details

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 require-LGT1 Indicates that the PR requires an LGTM. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR. labels Sep 3, 2021
@ti-chi-bot ti-chi-bot requested a review from TomShawn September 3, 2021 02:12
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 3, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Sep 3, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member Author

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

DetailsCommit hash: 6edc481

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 3, 2021
@ti-chi-bot ti-chi-bot merged commit 92bbd7a into pingcap:release-5.1 Sep 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

require-LGT1 Indicates that the PR requires an LGTM. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants