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

planner/core: fix a panic when select for update on join partition table with normal table (#26373) #26563

Merged
merged 5 commits into from
Sep 16, 2021
Merged

planner/core: fix a panic when select for update on join partition table with normal table (#26373) #26563

merged 5 commits into from
Sep 16, 2021

Commits on Jul 26, 2021

  1. cherry pick pingcap#26373 to release-5.1 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @tiancaiamao @ti-srebot
    tiancaiamao authored and ti-srebot committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    899f2bd View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2021

  1. resolve conflict

    @tiancaiamao
    tiancaiamao committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    d8e2391 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release-5.1' into pr/26563

    @tiancaiamao
    tiancaiamao committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    6c63b08 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2021

  1. Merge branch 'release-5.1' into release-5.1-0c7f9ac3dbb7

    @ti-chi-bot
    ti-chi-bot authored Sep 16, 2021
    Configuration menu
    Copy the full SHA
    498db6e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-5.1' into release-5.1-0c7f9ac3dbb7

    @ti-chi-bot
    ti-chi-bot authored Sep 16, 2021
    Configuration menu
    Copy the full SHA
    059a9ad View commit details
    Browse the repository at this point in the history