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

types: fix type merge about bit type (#23857) #24027

Merged
merged 9 commits into from
Apr 16, 2021
Merged

types: fix type merge about bit type (#23857) #24027

merged 9 commits into from
Apr 16, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 14, 2021 •
edited
Loading

cherry-pick #23857 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24027

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/24027:release-5.0-a9a579575965

Signed-off-by: lzmhhh123 lzmhhh123@gmail.com<!-- Thank you for contributing to TiDB!

PR Title Format:

  1. pkg [, pkg2, pkg3]: what's changed
  2. *: what's changed

-->

What problem does this PR solve?

Issue Number: close #23832

What is changed and how it works?

How it Works: make type merge infer for bit column compatible with MySQL 8.0

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix type merge about bit type.

@lzmhhh123 @ti-srebot
cherry pick pingcap#23857 to release-5.0
91c5a11 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner April 14, 2021 11:54
@ti-srebot ti-srebot requested review from wshwsh12 and removed request for a team April 14, 2021 11:54
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Apr 14, 2021
Merged
@ti-srebot ti-srebot added component/expression sig/execution SIG execution size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 14, 2021
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Apr 14, 2021
@ti-srebot
Copy link
Contributor Author

@lzmhhh123 you're already a collaborator in bot's repo.

@XuHuaiyu
Copy link
Contributor

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 15, 2021
@bb7133
Copy link
Member

bb7133 commented Apr 15, 2021

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • bb7133

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@bb7133
Copy link
Member

bb7133 commented Apr 15, 2021

/merge

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 15, 2021
@ti-chi-bot
Copy link
Member

@bb7133: /merge is only allowed for the committers in list.

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 16, 2021
@zimulala
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 91c5a11

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 16, 2021
@zimulala
Copy link
Contributor

/run-mybatis-test

@zhouqiang-cl
Copy link
Contributor

/run-mybatis-tests

@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot merged commit 25ab9ab into pingcap:release-5.0 Apr 16, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.0 ga, v5.0.1 Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

@ichn-hu ichn-hu Awaiting requested review from ichn-hu

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

Assignees

@lzmhhh123 lzmhhh123

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/expression sig/execution SIG execution size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/5.0-cherry-pick
Projects
None yet
Milestone
v5.0.1
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @XuHuaiyu @bb7133 @ti-chi-bot @zimulala @zhouqiang-cl @lzmhhh123