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

add GeneratedColumnPlaceholderInputStream (#6796) #6813

Merged
merged 6 commits into from
Apr 4, 2023
Merged

add GeneratedColumnPlaceholderInputStream (#6796) #6813

merged 6 commits into from
Apr 4, 2023

Commits on Feb 13, 2023

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

    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 13, 2023
    Configuration menu
    Copy the full SHA
    631499f View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. fix conflicts 

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

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

    @guo-shaoge
    guo-shaoge committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    afb6148 View commit details
    Browse the repository at this point in the history

  3. fix build 

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

  4. Merge branch 'cherry-pick-6796-to-release-6.5' of ssh://github.com/ti… 

    …-chi-bot/tiflash into cherry-pick-6796-to-release-6.5
    @guo-shaoge
    guo-shaoge committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    a53f4f4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release-6.5' into cherry-pick-6796-to-release-6.5

    @guo-shaoge
    guo-shaoge committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    273960d View commit details
    Browse the repository at this point in the history