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

executor: fix IndexMerge handle panic logic (#41036) #41062

Merged
merged 6 commits into from
Mar 29, 2023
Merged

executor: fix IndexMerge handle panic logic (#41036) #41062

merged 6 commits into from
Mar 29, 2023

Commits on Feb 5, 2023

  1. This is an automated cherry-pick of pingcap#41036 

    Signed-off-by: ti-chi-bot <[email protected]>
    @guo-shaoge @ti-chi-bot
    guo-shaoge authored and ti-chi-bot committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    34ce8e3 View commit details
    Browse the repository at this point in the history

  2. fix conflicts 

    Signed-off-by: guo-shaoge <[email protected]>
    @guo-shaoge
    guo-shaoge committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    9736b13 View commit details
    Browse the repository at this point in the history

  3. fix complie 

    Signed-off-by: guo-shaoge <[email protected]>
    @guo-shaoge
    guo-shaoge committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    8f588f0 View commit details
    Browse the repository at this point in the history

  4. fix case 

    Signed-off-by: guo-shaoge <[email protected]>
    @guo-shaoge
    guo-shaoge committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    cdd580a View commit details
    Browse the repository at this point in the history

  5. fix unuse var 

    Signed-off-by: guo-shaoge <[email protected]>
    @guo-shaoge
    guo-shaoge committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    f351e98 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Merge branch 'release-6.1' into cherry-pick-41036-to-release-6.1

    @guo-shaoge
    guo-shaoge authored Mar 29, 2023
    Configuration menu
    Copy the full SHA
    24d4db6 View commit details
    Browse the repository at this point in the history