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

sink/mysql: explicit_defaults_for_timestamp compatibility with mysql (#1638) #1659

Merged
merged 3 commits into from
Apr 15, 2021
Merged

sink/mysql: explicit_defaults_for_timestamp compatibility with mysql (#1638) #1659

merged 3 commits into from
Apr 15, 2021

Conversation

ti-srebot
Copy link
Contributor

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

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

# In ticdc repo:
git pr https://github.com/pingcap/ticdc/pull/1659

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

git push git@github.com:ti-srebot/ticdc.git pr/1659:release-5.0-6d4d4e4faead

What problem does this PR solve?

Fix #1585

What is changed and how it works?

  • Set session variable explicit_defaults_for_timestamp to ON in MySQL sink, which will keep the same behavior between upstream TiDB and downstream MySQL 5.7.
  • Note only set this session variable when the value explicit_defaults_for_timestamp in downstream is OFF, because in TiDB variable explicit_defaults_for_timestamp is readonly.

Check List

Tests

  • Unit test
  • Integration test

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release note

  • Set session variable explicit_defaults_for_timestamp to ON to make downstream MySQL5.7 keeps the same behavior with upstream TiDB.

@amyangfei @ti-srebot
cherry pick pingcap#1638 to release-5.0
19a5d95 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@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 status/ptal Could you please take a look? size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. type/bugfix This PR fixes a bug. labels Apr 14, 2021
@ti-srebot ti-srebot requested review from zier-one and overvenus April 14, 2021 03:32
@ti-chi-bot ti-chi-bot requested a review from amyangfei April 14, 2021 03:32
@ti-srebot ti-srebot added this to the v5.0.1 milestone Apr 14, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 14, 2021
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/run-kafka-tests

@zier-one
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • leoppro

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
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 15, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 19a5d95

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

/run-check-release-note

@amyangfei
Copy link
Contributor

/run-integration-tests

@ti-chi-bot
Copy link
Member

@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.

@overvenus
Copy link
Member

/lgtm

@amyangfei
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit 7a35809 into pingcap:release-5.0 Apr 15, 2021
amyangfei added a commit that referenced this pull request May 21, 2021
@amyangfei
Revert "sink/mysql: explicit_defaults_for_timestamp compatibility wit…
eeae2f2 
…h mysql (#1638) (#1659)"

This reverts commit 7a35809.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei approved these changes

@zier-one zier-one Awaiting requested review from zier-one

@overvenus overvenus Awaiting requested review from overvenus

Assignees

@amyangfei amyangfei

Labels
cherry-pick-approved Cherry pick PR approved by release team. size/L Denotes a PR that changes 100-499 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. status/ptal Could you please take a look? type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR.
Projects
None yet
Milestone
v5.0.1
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @amyangfei @zier-one @ti-chi-bot @overvenus @zhouqiang-cl