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

cherry-pick master #484 #472 to release 3.0 #486

Merged
merged 1 commit into from
Nov 6, 2019

Conversation

cfzjywxk
Copy link
Contributor

@cfzjywxk cfzjywxk commented Nov 5, 2019

cherry-pick #484 #472 to release 3.0 tu support innodb_lock_wait_timeout

add LockType field and Op field for pessimistic lock
@cfzjywxk cfzjywxk added the cherry pick Cherry pick commit to other branch label Nov 5, 2019
Copy link
Member

@coocood coocood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@youjiali1995 youjiali1995 merged commit c5d88d6 into pingcap:release-3.0 Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry pick Cherry pick commit to other branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants