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

session: fix set session variable make tidb_snapshot unwork (#28677) #28682

Merged
merged 4 commits into from
Jun 21, 2022
Merged

session: fix set session variable make tidb_snapshot unwork (#28677) #28682

merged 4 commits into from
Jun 21, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Oct 9, 2021 •
edited
Loading

cherry-pick #28677 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/28682

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

git push git@github.com:ti-srebot/tidb.git pr/28682:release-5.1-417c7358ef31

Signed-off-by: yisaer disxiaofei@163.com

What problem does this PR solve?

tidb_snapshot won't work after setting any session variable

What is changed and how it works?

fix set session variable make tidb_snapshot unwork

Check List

Tests

  • Unit test

Release note 

Fix the bug that setting any session variable will make `tidb_snapshot` unwork.

@Yisaer @ti-srebot
cherry pick pingcap#28677 to release-5.1
57dc3ba 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 9, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nolouch
  • xhebox

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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 Oct 9, 2021
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.1-cherry-pick labels Oct 9, 2021
@ti-srebot ti-srebot mentioned this pull request Oct 9, 2021
Merged
1 task
@ti-srebot ti-srebot added this to the v5.1.2 milestone Oct 9, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 9, 2021
@Yisaer
fix conflict
23ed182 
Signed-off-by: yisaer <disxiaofei@163.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 18, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 18, 2021
@xhebox
Copy link
Contributor

xhebox commented Jan 26, 2022

@Yisaer PTAL

nolouch
nolouch approved these changes Jan 26, 2022
View reviewed changes
Copy link
Member

@nolouch nolouch 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 Jan 26, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/24959bb861f2655c400a0a12aa58fa95e4fa19fa

@xhebox xhebox mentioned this pull request Jun 20, 2022
Closed
@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

to #35515

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 20, 2022
@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 24959bb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 20, 2022
@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

/merge

3 similar comments
@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

/merge

@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

/merge

@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

/merge

@xhebox
Copy link
Contributor

xhebox commented Jun 20, 2022

/run-mysql-test

@xhebox
Copy link
Contributor

xhebox commented Jun 21, 2022

/hold

waiting for CI fix

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2022
@xhebox
Copy link
Contributor

xhebox commented Jun 21, 2022

/run-mysql-test

@xhebox
Copy link
Contributor

xhebox commented Jun 21, 2022

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2022
@xhebox
Copy link
Contributor

xhebox commented Jun 21, 2022

/merge

@ti-chi-bot ti-chi-bot merged commit a1e195e into pingcap:release-5.1 Jun 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@nolouch nolouch nolouch approved these changes

Assignees

@Yisaer Yisaer

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. 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.1-cherry-pick
Projects
None yet
Milestone
v5.1.2
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @xhebox @sre-bot @nolouch @VelocityLight @Yisaer