Skip to content

br: sys collation check (#22387) (#22462)#22463

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
ti-chi-bot:cherry-pick-22462-to-master
Feb 13, 2026
Merged

br: sys collation check (#22387) (#22462)#22463
ti-chi-bot[bot] merged 2 commits intopingcap:masterfrom
ti-chi-bot:cherry-pick-22462-to-master

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #22462

This is an automated cherry-pick of #22387

First-time contributors' checklist

What is changed, added or deleted? (Required)

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)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-master This PR is cherry-picked to master from a source PR. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Feb 13, 2026
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 13, 2026
14 tasks
@ti-chi-bot ti-chi-bot self-assigned this Feb 13, 2026
@ti-chi-bot
Copy link
Member Author

@ti-chi-bot This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Feb 13, 2026

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Details

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.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request updates the Backup & Restore (BR) documentation to inform users about the new --sys-check-collation parameter. This feature, available from TiDB v8.5.5, allows BR to perform collation compatibility checks during system table restoration, preventing potential issues. The update ensures that the documentation accurately reflects the latest BR capabilities and includes a minor text correction.

Highlights

  • Documentation Update: Added a new note to the Backup & Restore (BR) overview documentation, detailing the --sys-check-collation parameter available from v8.5.5. This parameter enables BR to check collation compatibility when restoring system tables.
  • Typo Correction: Corrected a minor typographical error within the newly added documentation text for the --sys-check-collation parameter.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • br/backup-and-restore-overview.md
    • Added a note explaining the --sys-check-collation parameter for BR system table restoration.
    • Fixed a typo in the description of the --sys-check-collation parameter.
Activity
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request adds a note about the new --sys-check-collation parameter in BR. I've found merge conflict markers in the changes, which I've suggested removing. I also corrected a minor typo in the new text.

I am having trouble creating individual review comments. Click here to see my feedback.

br/backup-and-restore-overview.md (149-153)

critical

It looks like there are merge conflict markers in the document. This was likely caused by an automated cherry-pick. I've removed them and also corrected a typo (checkes -> checks).

> - Starting from v8.5.5, BR supports checking collation compatibility when restoring system tables by using the `--sys-check-collation` parameter. During restore, BR checks whether case conflicts exist under the target cluster collation. If the data is compatible with the target collation, BR can successfully restore backups from earlier versions. Otherwise, BR reports an error and terminates the restore.
References
  1. The style guide requires correcting spelling mistakes. The word 'checkes' has been corrected to 'checks'. (link)

@hfxsd
Copy link
Collaborator

hfxsd commented Feb 13, 2026

/approve

@ti-chi-bot ti-chi-bot bot added the approved label Feb 13, 2026
@hfxsd
Copy link
Collaborator

hfxsd commented Feb 13, 2026

/approve

@ti-chi-bot
Copy link

ti-chi-bot bot commented Feb 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hfxsd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hfxsd hfxsd removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 13, 2026
@ti-chi-bot ti-chi-bot bot merged commit ff17cf8 into pingcap:master Feb 13, 2026
11 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-22462-to-master branch February 13, 2026 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-master This PR is cherry-picked to master from a source PR. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants