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

txn: Check whether the primary matches when handling check_txn_status requests (#14637) #14659

Merged
merged 4 commits into from
May 10, 2023
Merged

txn: Check whether the primary matches when handling check_txn_status requests (#14637) #14659

merged 4 commits into from
May 10, 2023

Commits on Apr 26, 2023

  1. This is an automated cherry-pick of tikv#14637 

    close tikv#14636, ref pingcap/tidb#42937

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
    @MyonKeminta @ti-chi-bot
    MyonKeminta authored and ti-chi-bot committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    4714e0c View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. resolve the conflict 

    Signed-off-by: zyguan <zhongyangguan@gmail.com>
    @zyguan
    zyguan committed May 10, 2023
    Configuration menu
    Copy the full SHA
    73345a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-7.1' into cherry-pick-14637-to-release-7.1 

    Signed-off-by: zyguan <zhongyangguan@gmail.com>
    @zyguan
    zyguan committed May 10, 2023
    Configuration menu
    Copy the full SHA
    080a0c3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-7.1' into cherry-pick-14637-to-release-7.1

    @zyguan
    zyguan committed May 10, 2023
    Configuration menu
    Copy the full SHA
    cea56f6 View commit details
    Browse the repository at this point in the history