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

br: fix br integration test 7.1.1 (#50740) #51438

Merged
merged 2 commits into from
Mar 1, 2024
Merged

br: fix br integration test 7.1.1 (#50740) #51438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03c6f91
fix integration test
Leavrth Jan 26, 2024
7f2f4c8
fix integration test
Leavrth Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions br/pkg/restore/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3764,12 +3764,12 @@ func CheckNewCollationEnable(
if backupNewCollationEnable == "" {
if CheckRequirements {
return enabled, errors.Annotatef(berrors.ErrUnknown,
"the value 'new_collations_enabled_on_first_bootstrap' not found in backupmeta. "+
"the config 'new_collations_enabled_on_first_bootstrap' not found in backupmeta. "+
"you can use \"SELECT VARIABLE_VALUE FROM mysql.tidb WHERE VARIABLE_NAME='new_collations_enabled_on_first_bootstrap';\" to manually check the config. "+
"if you ensure the value 'new_collations_enabled_on_first_bootstrap' in backup cluster is as same as restore cluster, use --check-requirements=false to skip this check",
)
}
log.Warn("the config 'new_collations_enabled_on_first_bootstrap' is not in backupmeta")
log.Warn("the config 'new_collations_enabled_on_first_bootstrap' is not found in backupmeta")
return enabled, nil
}

Expand Down