Skip to content

Conversation

@TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Apr 1, 2022

What is changed, added or deleted? (Required)

Add comments for 6.0 br compatibility because of the default changing of the config new_collations_enabled_on_first_bootstrap from false to true.

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)
  • v6.0 (TiDB 6.0 versions)
  • 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 Apr 1, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • en-jin19

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.

Details

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 missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 1, 2022
@TomShawn TomShawn requested review from en-jin19 and joccau April 1, 2022 09:23
@TomShawn TomShawn added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. v6.0 This PR/issue applies to TiDB v6.0. area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). needs-cherry-pick-release-6.0 labels Apr 1, 2022
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Apr 1, 2022
Co-authored-by: Enwei <jinenwei@pingcap.com>
Copy link
Contributor

@en-jin19 en-jin19 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 Apr 1, 2022
@joccau
Copy link
Contributor

joccau commented Apr 1, 2022

/cc @3pointer PTAL

@ti-chi-bot ti-chi-bot requested a review from 3pointer April 1, 2022 09:57
@ti-chi-bot
Copy link
Member

@joccau: GitHub didn't allow me to request PR reviews from the following users: PTAL.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

/cc @3pointer PTAL

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.

Copy link
Contributor

@3pointer 3pointer 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 1, 2022
@TomShawn TomShawn requested a review from joccau April 1, 2022 11:50
Copy link
Contributor

@joccau joccau left a comment

Choose a reason for hiding this comment

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

LGTM

@TomShawn
Copy link
Contributor Author

TomShawn commented Apr 2, 2022

/merge

@ti-chi-bot
Copy link
Member

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

DetailsCommit hash: ddf4838

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 2, 2022
@ti-chi-bot ti-chi-bot merged commit e7df687 into pingcap:master Apr 2, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8042.

@TomShawn TomShawn deleted the new-collatio-br branch April 2, 2022 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/br Indicates that the Issue or PR belongs to the area of BR (Backup & Restore). area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. size/S Denotes a PR that changes 10-29 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. v6.0 This PR/issue applies to TiDB v6.0.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants