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) #14495

Merged
merged 2 commits into from
Jan 16, 2020

Conversation

imtbkcat
Copy link

What problem does this PR solve?

cherry-pick #13935

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

@lysu
Copy link
Contributor

lysu commented Jan 16, 2020

/run-all-tests

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

@lysu lysu added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 16, 2020
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
Copy link
Member

jackysp commented Jan 16, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Jan 16, 2020

Your auto merge job has been accepted, waiting for 14439

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

sre-bot commented Jan 16, 2020

/run-all-tests

@jackysp jackysp merged commit c54b226 into pingcap:release-2.1 Jan 16, 2020
@bb7133 bb7133 added this to the v2.1.20 milestone Jan 16, 2020
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/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.

5 participants