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: annotate the previous statement to the error when transaction commit failed (#12087) #12199

Merged
merged 2 commits into from
Sep 24, 2019

Conversation

jackysp
Copy link
Member

@jackysp jackysp commented Sep 16, 2019

Cherry pick #12087 to release 3.0.

Conflicts:
ddl/db_test.go
session/tidb.go

@jackysp jackysp added type/enhancement The issue or PR belongs to an enhancement. type/3.0 cherry-pick labels Sep 16, 2019
@jackysp jackysp marked this pull request as ready for review September 23, 2019 09:03
@jackysp jackysp requested review from lysu and coocood September 23, 2019 09:03
…n commit failed (pingcap#12087)

 Conflicts:
	ddl/db_test.go
	session/tidb.go
@jackysp jackysp force-pushed the prev_commit_err_3.0 branch from ad7aea9 to 2d44412 Compare September 23, 2019 09:10
@coocood
Copy link
Member

coocood commented Sep 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

@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. labels Sep 24, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Sep 24, 2019

/run-all-tests

@sre-bot sre-bot merged commit 790b5d5 into pingcap:release-3.0 Sep 24, 2019
jackysp added a commit to jackysp/tidb that referenced this pull request Nov 7, 2019
sre-bot pushed a commit that referenced this pull request Nov 7, 2019
@jackysp jackysp deleted the prev_commit_err_3.0 branch February 27, 2020 13:34
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/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants