*: fix the flen type datetime for union/case-when/control-funcs (#30588) #30830

ti-srebot · 2021-12-17T05:15:15Z

cherry-pick #30588 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/30830

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

git push [email protected]:ti-srebot/tidb.git pr/30830:release-5.0-8e11e0367f02

What problem does this PR solve?

Issue Number: close #29498

Problem Summary:

What is changed and how it works?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

bugfix: concat(ifnull(time(3)) returns different results from MySQL

#29498

Signed-off-by: ti-srebot <[email protected]>

ti-chi-bot · 2021-12-17T05:15:16Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

XuHuaiyu
windtalker

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

ti-srebot · 2021-12-17T05:15:18Z

/run-all-tests

ti-srebot · 2021-12-17T05:15:25Z

@bestwoody please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tidb/invitations

XuHuaiyu

LGTM

windtalker · 2021-12-17T06:57:57Z

expression/builtin_control.go

@@ -139,6 +139,11 @@ func InferType4ControlFuncs(lexp, rexp Expression) *types.FieldType {
 		if lhs.Tp != mysql.TypeNull || rhs.Tp != mysql.TypeNull {
 			resultFieldType.Decimal = types.UnspecifiedLength
 		}
+		if resultFieldType.Tp == mysql.TypeEnum || resultFieldType.Tp == mysql.TypeSet {


looks like this is not part of #30588?

windtalker

LGTM

bestwoody · 2021-12-17T07:56:28Z

/merge

ti-chi-bot · 2021-12-17T07:56:30Z

@bestwoody: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

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.

XuHuaiyu · 2021-12-20T09:02:50Z

/merge

XuHuaiyu · 2021-12-20T09:24:32Z

/merge

XuHuaiyu · 2021-12-20T09:26:50Z

/merge cancel

XuHuaiyu · 2021-12-20T10:21:09Z

/merge

ti-chi-bot · 2021-12-20T10:21:12Z

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

Commit hash: 299cfa9

ti-chi-bot · 2021-12-20T10:21:24Z

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

cherry pick pingcap#30588 to release-5.0

e1608e6

Signed-off-by: ti-srebot <[email protected]>

ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 17, 2021

ti-srebot mentioned this pull request Dec 17, 2021

*: fix the flen type datetime for union/case-when/control-funcs #30588

Merged

12 tasks

ti-srebot added component/expression 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 Dec 17, 2021

ti-chi-bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Dec 17, 2021

ti-srebot requested review from fuzhe1989, guo-shaoge, windtalker and XuHuaiyu December 17, 2021 05:15

ti-srebot assigned bestwoody Dec 17, 2021

ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 17, 2021

bestwoody added 3 commits December 17, 2021 13:43

Update builtin_control.go

cd97d30

Update executor_test.go

509124a

Update executor_test.go

39ae5e9

ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 17, 2021

XuHuaiyu approved these changes Dec 17, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 17, 2021

windtalker reviewed Dec 17, 2021

View reviewed changes

Update builtin_control.go

fca5573

windtalker approved these changes Dec 17, 2021

View reviewed changes

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 Dec 17, 2021

zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 20, 2021

ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/cherry-pick-not-approved labels Dec 20, 2021

Merge branch 'release-5.0' into release-5.0-8e11e0367f02

48f00c2

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021

bestwoody added 2 commits December 20, 2021 17:10

Update executor_test.go

55fddb3

Merge branch 'release-5.0' into release-5.0-8e11e0367f02

299cfa9

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021

Merge branch 'release-5.0' into release-5.0-8e11e0367f02

5f50db8

ti-chi-bot merged commit 918feed into pingcap:release-5.0 Dec 20, 2021

zhouqiang-cl added this to the v5.0.6 milestone Dec 21, 2021

XuHuaiyu mentioned this pull request Dec 22, 2021

releases: add tidb 5.0.6 release notes pingcap/docs-cn#8041

Merged

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: fix the flen type datetime for union/case-when/control-funcs (#30588) #30830

*: fix the flen type datetime for union/case-when/control-funcs (#30588) #30830

ti-srebot commented Dec 17, 2021 •

edited

Loading

ti-chi-bot commented Dec 17, 2021 •

edited

Loading

ti-srebot commented Dec 17, 2021

ti-srebot commented Dec 17, 2021

XuHuaiyu left a comment

windtalker Dec 17, 2021

windtalker left a comment

bestwoody commented Dec 17, 2021

ti-chi-bot commented Dec 17, 2021

XuHuaiyu commented Dec 20, 2021

XuHuaiyu commented Dec 20, 2021

XuHuaiyu commented Dec 20, 2021

XuHuaiyu commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

*: fix the flen type datetime for union/case-when/control-funcs (#30588) #30830

*: fix the flen type datetime for union/case-when/control-funcs (#30588) #30830

Conversation

ti-srebot commented Dec 17, 2021 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Dec 17, 2021 • edited Loading

ti-srebot commented Dec 17, 2021

ti-srebot commented Dec 17, 2021

XuHuaiyu left a comment

Choose a reason for hiding this comment

windtalker Dec 17, 2021

Choose a reason for hiding this comment

windtalker left a comment

Choose a reason for hiding this comment

bestwoody commented Dec 17, 2021

ti-chi-bot commented Dec 17, 2021

XuHuaiyu commented Dec 20, 2021

XuHuaiyu commented Dec 20, 2021

XuHuaiyu commented Dec 20, 2021

XuHuaiyu commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-srebot commented Dec 17, 2021 •

edited

Loading

ti-chi-bot commented Dec 17, 2021 •

edited

Loading