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

[6.5] Cherry-pick changes about the fix of pessimistic transactions with primary changed #1120

Merged

Conversation

MyonKeminta
Copy link
Contributor

ref: pingcap/tidb#42937

Cherry-picks #1105 #1107 to release-6.5 branch

MyonKeminta and others added 3 commits May 23, 2023 19:55
… lock on the key (if any) is a real primary lock (pingcap#1105)

* Change implementation

* Fix typo in comment

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Update proto/kvrpcpb.proto

Co-authored-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: ekexium <eke@fastmail.com>
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta requested a review from ekexium May 23, 2023 12:20
@MyonKeminta MyonKeminta changed the base branch from master to release-6.5 May 23, 2023 12:21
@MyonKeminta MyonKeminta requested a review from cfzjywxk May 23, 2023 12:21
@MyonKeminta
Copy link
Contributor Author

/merge

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta merged commit 3dc79e7 into pingcap:release-6.5 May 24, 2023
@MyonKeminta MyonKeminta deleted the m/cherry-pick-primary-change-fix branch May 24, 2023 05:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants