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

*: fix unexpected error when setting collate for database (#16283) #16540

Merged
merged 6 commits into from
Apr 22, 2020
Merged

*: fix unexpected error when setting collate for database (#16283) #16540

merged 6 commits into from
Apr 22, 2020

Commits on Apr 17, 2020

  1. cherry pick pingcap#16283 to release-4.0 

    Signed-off-by: sre-bot <sre-bot@pingcap.com>
    @bb7133 @sre-bot
    bb7133 authored and sre-bot committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1f1fb46 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. resolve conflict

    @bb7133
    bb7133 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    1ec723f View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Merge branch 'release-4.0' into release-4.0-6b034d42375b

    @sre-bot
    sre-bot authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    d820fd8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-6b034d42375b

    @zz-jason
    zz-jason authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    a601a84 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into release-4.0-6b034d42375b

    @sre-bot
    sre-bot authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    d56f448 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release-4.0' into release-4.0-6b034d42375b

    @zz-jason
    zz-jason authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    b36a5f7 View commit details
    Browse the repository at this point in the history