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.

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

types: fix type merge about bit type #23857

Merged
merged 9 commits into from
Apr 14, 2021

Conversation

lzmhhh123
Copy link
Contributor

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.

Signed-off-by: lzmhhh123 <lzmhhh123@gmail.com>
Signed-off-by: lzmhhh123 <lzmhhh123@gmail.com>
@lzmhhh123 lzmhhh123 requested a review from a team as a code owner April 6, 2021 06:25
@lzmhhh123 lzmhhh123 requested review from XuHuaiyu and removed request for a team April 6, 2021 06:25
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 6, 2021
@lzmhhh123 lzmhhh123 added needs-cherry-pick-4.0 needs-cherry-pick-release-5.0 type/bugfix This PR fixes a bug. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 6, 2021
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 6, 2021
@lzmhhh123
Copy link
Contributor Author

/cc @XuHuaiyu @ichn-hu

@ti-chi-bot ti-chi-bot requested a review from ichn-hu April 6, 2021 08:58
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Apr 7, 2021

  • The field_types_merge_rules in TiDB is the same as that defined in MySQL 5.7
  • Why the result in MySQL 5.7 can also return the same result as 8.0 but with a different type?
mysql> select a from t union select 10;
Field   1:  `a`
Catalog:    `def`
Database:   ``
Table:      ``
Org_table:  ``
Type:       VAR_STRING
Collation:  binary (63)
Length:     20
Max_length: 2
Decimals:   0
Flags:      BINARY


+------+
| a    |
+------+
| 10   |
| 1    |
| 2    |
+------+
3 rows in set (0.00 sec)

@lzmhhh123
Copy link
Contributor Author

IMHO, the result of bit merge int is int looks much more reasonable. It's also the same as MySQL 8.0. We'd better not keep all consistent as MySQL 5.7 brainlessly.

@XuHuaiyu
Copy link
Contributor

/lgtm

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

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • wshwsh12

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.

@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 14, 2021
@wshwsh12
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 257ddaa

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

/run-all-tests

@wshwsh12
Copy link
Contributor

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit a9a5795 into pingcap:master Apr 14, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Apr 14, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #24026

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Apr 14, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #24027

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression needs-cherry-pick-release-5.0 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bit column union Numeric literals select got the wrong results
6 participants