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

*: fix condition check push down for pessimistic transaction (#14141) #14175

Merged
merged 1 commit into from
Dec 23, 2019

Conversation

jackysp
Copy link
Member

@jackysp jackysp commented Dec 23, 2019

Conflicts:
store/mockstore/mocktikv/mvcc_leveldb.go

What problem does this PR solve?

Cherry pick #14141 to release 3.0.

…#14141)

 Conflicts:
	store/mockstore/mocktikv/mvcc_leveldb.go
@jackysp jackysp requested review from cfzjywxk and coocood and removed request for cfzjywxk December 23, 2019 03:02
@coocood
Copy link
Member

coocood commented Dec 23, 2019

LGTM

Copy link
Contributor

@lysu lysu 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
Copy link
Member Author

jackysp commented Dec 23, 2019

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 23, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Dec 23, 2019

Your auto merge job has been accepted, waiting for 13955

@sre-bot
Copy link
Contributor

sre-bot commented Dec 23, 2019

/run-all-tests

@sre-bot sre-bot merged commit 36e428e into pingcap:release-3.0 Dec 23, 2019
@jackysp jackysp deleted the fix_insert_push_3.0 branch February 27, 2020 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants