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

expression: split isTrue and isFalse expression sig (#16542) #16627

Merged
merged 7 commits into from
May 7, 2020
Merged

expression: split isTrue and isFalse expression sig (#16542) #16627

merged 7 commits into from
May 7, 2020

Commits on Apr 20, 2020

  1. cherry pick pingcap#16542 to release-3.0 

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

Commits on Apr 26, 2020

  1. solve conflicts

    @Reminiscent
    Reminiscent committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    6d946ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-3.0' of https://github.com/pingcap/tidb into sr… 

    …e-bot/release-3.0-8b6d53a4a959
    @Reminiscent
    Reminiscent committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    ef857fb View commit details
    Browse the repository at this point in the history

  3. solve conflicts

    @Reminiscent
    Reminiscent committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    6b49cb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. Merge branch 'release-3.0' into release-3.0-8b6d53a4a959

    @zz-jason
    zz-jason committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    28bc317 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Merge branch 'release-3.0' of https://github.com/pingcap/tidb into sr… 

    …e-bot/release-3.0-8b6d53a4a959

� Conflicts:
�	executor/executor_test.go
    @Reminiscent
    Reminiscent committed May 6, 2020
    Configuration menu
    Copy the full SHA
    73f22a1 View commit details
    Browse the repository at this point in the history

  2. solve conflict

    @Reminiscent
    Reminiscent committed May 6, 2020
    Configuration menu
    Copy the full SHA
    8c09329 View commit details
    Browse the repository at this point in the history