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.

Sign up for GitHub

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

Jump to bottom

mysql: add write conflict error #585

Merged
merged 2 commits into from
Oct 23, 2019
Merged

mysql: add write conflict error #585

merged 2 commits into from
Oct 23, 2019

Conversation

alivxxx
Copy link
Contributor

@alivxxx alivxxx commented Oct 22, 2019 •
edited
Loading

Cherry pick #281 and #334
For pingcap/tidb#12878

@alivxxx alivxxx added the type/enhancement New feature or request label Oct 22, 2019
jackysp
jackysp reviewed Oct 23, 2019
View reviewed changes
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 requested a review from lysu October 23, 2019 03:28
@coocood
Copy link
Member

coocood commented Oct 23, 2019

LGTM

@coocood coocood merged commit 32865d3 into pingcap:release-2.1 Oct 23, 2019
@alivxxx alivxxx deleted the release-2.1 branch October 23, 2019 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackysp jackysp jackysp left review comments

@lysu lysu lysu approved these changes

Assignees
No one assigned
Labels
type/cherry-pick-for-release-2.1 type/enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@alivxxx @coocood @lysu @jackysp @kennytm