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

expression: handle mixed offsets and names zones in CONVERT_TZ (#28528) #32501

Closed
wants to merge 1 commit into from
Closed

expression: handle mixed offsets and names zones in CONVERT_TZ (#28528) #32501

wants to merge 1 commit into from

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Feb 21, 2022 •
edited
Loading

cherry-pick #28528 to release-5.3
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/32501

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

git push [email protected]:ti-srebot/tidb.git pr/32501:release-5.3-465d2e7450f0
  • Support mixed named timezones and UTC offsets
  • Add support for +14:00
  • Support SYSTEM timezone

What problem does this PR solve?

This fixes the issues as reported in #8311

This fixes mixing named timezones like Europe/Moscow and UTC offsets like +01:00.

It also fixes support for the +14:00 timezone.

Check List

Tests

  • Manual test (add detailed scripts or steps below)
  • Unit tests

Documentation

  • Affects user behaviors
  • Changes MySQL compatibility

Release note 

`CONVERT_TZ()` now supports mixing named timezones and UTC offsets

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has not been approved.

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-chi-bot
Copy link
Member

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added 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 Feb 21, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed 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 Feb 21, 2022
@ti-srebot ti-srebot mentioned this pull request Feb 21, 2022
Merged
4 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick labels Feb 21, 2022
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 21, 2022
kennytm
kennytm reviewed Feb 21, 2022
View reviewed changes
expression/builtin_time_test.go
func TestConvertTz(t *testing.T) {
t.Parallel()
ctx := createContext(t)
=======
func (s *testEvaluatorSuite) TestConvertTz(c *C) {
>>>>>>> 465d2e745... expression: handle mixed offsets and names zones in CONVERT_TZ (#28528)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge conflict

@mjonss
Copy link
Contributor

mjonss commented Feb 21, 2022

This already exists in the release-5.3 branch ( 465d2e7 )

@mjonss
Copy link
Contributor

mjonss commented Feb 21, 2022

/close

@ti-chi-bot
Copy link
Member

@mjonss: Closed this PR.

In response to this:

/close

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot closed this Feb 21, 2022
@mjonss mjonss deleted the release-5.3-465d2e7450f0 branch February 21, 2022 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

@mjonss mjonss Awaiting requested review from mjonss

Assignees

@dveeden dveeden

Labels
do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.3-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-srebot @ti-chi-bot @mjonss @kennytm @dveeden