From 44f39e98a29e19bc00f2d6c1a7ab1609a7a9e822 Mon Sep 17 00:00:00 2001 From: Jianjun Liao <36503113+Leavrth@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:12:21 +0800 Subject: [PATCH] br: fix br integration test 6.5.8 (#50740) close pingcap/tidb#50741 --- br/pkg/restore/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/br/pkg/restore/client.go b/br/pkg/restore/client.go index 58bf97b031df0..21e92c0a0e694 100644 --- a/br/pkg/restore/client.go +++ b/br/pkg/restore/client.go @@ -2901,12 +2901,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 }