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

br: add collation restriction #3646

Merged
merged 6 commits into from
Jul 1, 2020
Merged

br: add collation restriction #3646

merged 6 commits into from
Jul 1, 2020

Conversation

3pointer
Copy link
Contributor

What is changed, added or deleted? (Required)

br doesn't support backup/restore on cluster with different new_collations_enabled_on_first_bootstrap value.

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

  • master (the latest development version)
  • 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)?

  • This PR is translated from:
  • Other reference link(s):

@3pointer 3pointer requested a review from bb7133 June 15, 2020 03:18
@TomShawn TomShawn self-requested a review June 15, 2020 05:05
@TomShawn TomShawn added needs-cherry-pick-4.0 size/small Changes of a small size. translation/doing This PR’s assignee is translating this PR. labels Jun 15, 2020
bb7133
bb7133 reviewed Jun 23, 2020
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@bb7133
Copy link
Member

bb7133 commented Jun 23, 2020

PTAL @TomShawn

@bb7133 bb7133 added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 23, 2020
3pointer and others added 2 commits July 1, 2020 14:51
@3pointer @TomShawn
Update br/backup-and-restore-tool.md
d683ba5 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@3pointer @TomShawn
Update br/backup-and-restore-tool.md
738a5a4 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn
TomShawn approved these changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@TomShawn TomShawn 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 TomShawn added status/can-merge Indicates a PR has been approved by a committer. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 1, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 5772762 into pingcap:master Jul 1, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 1, 2020
@3pointer @ti-srebot
cherry pick pingcap#3646 to release-4.0
fbb461d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 1, 2020
Merged
5 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3846

ti-srebot added a commit that referenced this pull request Jul 1, 2020
@ti-srebot @3pointer
br: add collation restriction (#3646) (#3846)
3e63a18 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: 3pointer <luancheng@pingcap.com>
@ireneontheway ireneontheway added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Aug 4, 2020
@ireneontheway ireneontheway mentioned this pull request Aug 4, 2020
Merged
9 tasks
@ti-srebot ti-srebot mentioned this pull request Aug 13, 2020
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 left review comments

@TomShawn TomShawn TomShawn approved these changes

Assignees

@ireneontheway ireneontheway

Labels
size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@3pointer @bb7133 @ti-srebot @TomShawn @toutdesuite @ireneontheway