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

planner: use the same unique id between schema and column in ProjUponView (#19461) #19491

Merged
merged 5 commits into from
Sep 1, 2020
Merged

planner: use the same unique id between schema and column in ProjUponView (#19461) #19491

merged 5 commits into from
Sep 1, 2020

Commits on Aug 26, 2020

  1. cherry pick pingcap#19461 to release-4.0 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @wshwsh12 @ti-srebot
    wshwsh12 authored and ti-srebot committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    d97b40e View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. resolve confilt

    @wshwsh12
    wshwsh12 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    d305c5c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/release-4.0' into release-4.0-… 

    …38c751041424
    @wshwsh12
    wshwsh12 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    c3cdd1f View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Merge branch 'release-4.0' into release-4.0-38c751041424

    @ti-srebot
    ti-srebot authored Sep 1, 2020
    Configuration menu
    Copy the full SHA
    b5b57e5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into release-4.0-38c751041424

    @ti-srebot
    ti-srebot authored Sep 1, 2020
    Configuration menu
    Copy the full SHA
    cacd85a View commit details
    Browse the repository at this point in the history