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

session: if txn invalid do not active it and return an error (#13935) #13988

Merged
merged 2 commits into from
Dec 11, 2019

Conversation

jackysp
Copy link
Member

@jackysp jackysp commented Dec 9, 2019

Conflicts:
executor/batch_point_get.go
executor/point_get.go

What problem does this PR solve?

Cherry-pick #13935 to release 3.0.

…#13935)

 Conflicts:
	executor/batch_point_get.go
	executor/point_get.go
@jackysp jackysp requested review from tiancaiamao and coocood and removed request for tiancaiamao December 9, 2019 06:41
@coocood
Copy link
Member

coocood commented Dec 9, 2019

LGTM

1 similar comment
@tiancaiamao
Copy link
Contributor

LGTM

@tiancaiamao tiancaiamao added the status/LGT2 Indicates that a PR has LGTM 2. label Dec 9, 2019
@jackysp
Copy link
Member Author

jackysp commented Dec 11, 2019

/merge

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

sre-bot commented Dec 11, 2019

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Dec 11, 2019

@jackysp merge failed.

@jackysp
Copy link
Member Author

jackysp commented Dec 11, 2019

/run-unit-test

@jackysp jackysp merged commit 35159fe into pingcap:release-3.0 Dec 11, 2019
@jackysp jackysp deleted the pess_panic_3.0 branch February 27, 2020 13:18
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. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants