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

Update the description about DM collation_compatible config #7355

Merged
merged 4 commits into from
Jan 6, 2022
Merged

Update the description about DM collation_compatible config #7355

merged 4 commits into from
Jan 6, 2022

Conversation

WizardXiao
Copy link
Contributor

@WizardXiao WizardXiao commented Dec 31, 2021 •
edited by TomShawn
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add DM collation_compatible config description.

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • dveeden
  • ran-huang

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 ti-chi-bot added the first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. label Dec 31, 2021
@CLAassistant
Copy link

CLAassistant commented Dec 31, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 31, 2021
@WizardXiao WizardXiao closed this Dec 31, 2021
@WizardXiao WizardXiao deleted the add-collation-desc branch December 31, 2021 07:40
@WizardXiao WizardXiao restored the add-collation-desc branch December 31, 2021 08:36
@WizardXiao WizardXiao reopened this Dec 31, 2021
@WizardXiao
Copy link
Contributor Author

/cc @lance6716 @sunzhaoyang @ran-huang

@shichun-0415 shichun-0415 added needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. translation/doing This PR's assignee is translating this PR. type/bugfix This PR fixes a bug. area/dm sig/docs Indicates that the Issue or PR belongs to the docs SIG. and removed missing-translation-status This PR does not have translation status info. labels Jan 4, 2022
@shichun-0415 shichun-0415 self-assigned this Jan 4, 2022
@TomShawn TomShawn added v5.4 This PR/issue applies to TiDB v5.4. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. and removed needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. type/bugfix This PR fixes a bug. sig/docs Indicates that the Issue or PR belongs to the docs SIG. translation/doing This PR's assignee is translating this PR. labels Jan 4, 2022
@shichun-0415 shichun-0415 removed their request for review January 4, 2022 02:49
ran-huang
ran-huang approved these changes Jan 4, 2022
View reviewed changes
Copy link
Contributor

@ran-huang ran-huang left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2022
@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 Jan 6, 2022
lance6716
lance6716 reviewed Jan 6, 2022
View reviewed changes
Copy link
Contributor

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

rest lgtm

dm/task-configuration-file-full.md Outdated Show resolved Hide resolved
@ran-huang
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9670c70

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 6, 2022
@ti-chi-bot ti-chi-bot merged commit 6cf15e2 into pingcap:master Jan 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@en-jin19 en-jin19 en-jin19 left review comments

@ran-huang ran-huang ran-huang approved these changes

@lance6716 lance6716 lance6716 approved these changes

@dveeden dveeden dveeden approved these changes

@sunzhaoyang sunzhaoyang Awaiting requested review from sunzhaoyang

Assignees
No one assigned
Labels
area/dm first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. size/XS Denotes a PR that changes 0-9 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. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v5.4 This PR/issue applies to TiDB v5.4.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@WizardXiao @ti-chi-bot @CLAassistant @ran-huang @dveeden @lance6716 @en-jin19 @TomShawn @shichun-0415