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

planner/core: fix the 'for update' condition for the point get query (#11771) #11775

Merged
merged 4 commits into from
Aug 19, 2019

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Aug 19, 2019

cherry-pick #11771 to release-3.0


What problem does this PR solve?

Fix bug introduced in #11715

Sometimes, InTxn() is not precise, so we should check both InTxn() and autocommit

// We should set the 'for update' flag in this case.
set @@auto_commit = 0;
select * from t where id = 6 for update;  // This is not InTxn() when the planner run here, because it's still in the plan phase.

What is changed and how it works?

The check condition is changed from InTxn() to IsAutocommit() || InTxn()

Check List

Tests

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

Related changes

  • Need to cherry-pick to the release branch

@sre-bot
Copy link
Contributor Author

sre-bot commented Aug 19, 2019

/run-all-tests

Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jackysp jackysp added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 19, 2019
Copy link
Member

@coocood coocood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@coocood coocood merged commit ec24062 into pingcap:release-3.0 Aug 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/planner SIG: Planner status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants