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

ddl: fix ddl hang over when it meets panic in cancelling path (#23204) #23297

Merged
merged 7 commits into from
Mar 16, 2021
Merged

ddl: fix ddl hang over when it meets panic in cancelling path (#23204) #23297

merged 7 commits into from
Mar 16, 2021

Commits on Mar 13, 2021

  1. cherry pick pingcap#23204 to release-4.0 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @AilinKid @ti-srebot
    AilinKid authored and ti-srebot committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    2be560d View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. remote resolves 

    Signed-off-by: ailinkid <314806019@qq.com>
    @AilinKid
    AilinKid committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    59b92e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-46f5f217725e

    @AilinKid
    AilinKid authored Mar 15, 2021
    Configuration menu
    Copy the full SHA
    d303a90 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into release-4.0-46f5f217725e

    @ti-chi-bot
    ti-chi-bot authored Mar 15, 2021
    Configuration menu
    Copy the full SHA
    aa08058 View commit details
    Browse the repository at this point in the history

  4. fix json unmarsh error 

    Signed-off-by: ailinkid <314806019@qq.com>
    @AilinKid
    AilinKid committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    1d5dd09 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Merge branch 'release-4.0' into release-4.0-46f5f217725e

    @AilinKid
    AilinKid authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    3d4bb86 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-46f5f217725e

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