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) #41063

Merged
merged 7 commits into from
Feb 11, 2023
Merged

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

merged 7 commits into from
Feb 11, 2023

Commits on Feb 5, 2023

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

    Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
    @guo-shaoge @ti-chi-bot
    guo-shaoge authored and ti-chi-bot committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    ca88fc2 View commit details
    Browse the repository at this point in the history

  2. fix conflicts 

    Signed-off-by: guo-shaoge <shaoge1994@163.com>
    @guo-shaoge
    guo-shaoge committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    090a571 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. fix const var 

    Signed-off-by: guo-shaoge <shaoge1994@163.com>
    @guo-shaoge
    guo-shaoge committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    4a0fcc4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-6.5' of github.com:pingcap/tidb into cherry-pic… 

    …k-41036-to-release-6.5

Signed-off-by: guo-shaoge <shaoge1994@163.com>
    @guo-shaoge
    guo-shaoge committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    6bdd527 View commit details
    Browse the repository at this point in the history

  3. fix conflicts 

    Signed-off-by: guo-shaoge <shaoge1994@163.com>
    @guo-shaoge
    guo-shaoge committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    6574662 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

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

    @ti-chi-bot
    ti-chi-bot authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    7114142 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-6.5' into cherry-pick-41036-to-release-6.5

    @ti-chi-bot
    ti-chi-bot authored Feb 9, 2023
    Configuration menu
    Copy the full SHA
    46c228f View commit details
    Browse the repository at this point in the history