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

executor: do not append extra cols to the old row when updateDupRow (#33656) #35165

Merged
merged 9 commits into from
Jun 16, 2022
Merged

executor: do not append extra cols to the old row when updateDupRow (#33656) #35165

merged 9 commits into from
Jun 16, 2022

Commits on Jun 6, 2022

  1. cherry pick pingcap#33656 to release-5.3 

    Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
    @zyguan @ti-srebot
    zyguan authored and ti-srebot committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    eacef99 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

  1. Merge branch 'release-5.3' into release-5.3-b860500988e0

    @zyguan
    zyguan authored Jun 14, 2022
    Configuration menu
    Copy the full SHA
    08ebb3b View commit details
    Browse the repository at this point in the history

  2. resolve conflicts 

    Signed-off-by: zyguan <zhongyangguan@gmail.com>
    @zyguan
    zyguan committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    11ff615 View commit details
    Browse the repository at this point in the history

  3. fix CI test 

    Signed-off-by: zyguan <zhongyangguan@gmail.com>
    @zyguan
    zyguan committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    75802b4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release-5.3' into release-5.3-b860500988e0

    @zyguan
    zyguan authored Jun 14, 2022
    Configuration menu
    Copy the full SHA
    1642b03 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release-5.3' into release-5.3-b860500988e0

    @zyguan
    zyguan authored Jun 14, 2022
    Configuration menu
    Copy the full SHA
    3e16986 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Merge branch 'release-5.3' into release-5.3-b860500988e0

    @zyguan
    zyguan authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    1becb88 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-5.3' into release-5.3-b860500988e0

    @zyguan
    zyguan authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    1827286 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-5.3' into release-5.3-b860500988e0

    @ti-chi-bot
    ti-chi-bot authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    71ba43e View commit details
    Browse the repository at this point in the history