Skip to content

Commit 6bf27b7

Browse files
author
Marek Młynarski
committed
BUG#36004885 BUG#36004919 Align check name in WL and implementation and Don't link mysqlserverteam.com
This commit fixes bug with aligning check names with WL description. It also fixes links that pointed to non-functional "mysqlserverteam.com" site, and replaces them to equivalent pages on dev.mysql.com. Change-Id: I41c1f20e8cc20ed68f74fb0ec26083e932baa671
1 parent cc3e737 commit 6bf27b7

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

modules/util/upgrade_check.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2073,7 +2073,7 @@ class Deprecated_auth_method_check : public Sql_upgrade_check {
20732073
public:
20742074
Deprecated_auth_method_check(mysqlshdk::utils::Version target_ver)
20752075
: Sql_upgrade_check(
2076-
"mysqlDeprecatedAuthMethodCheck",
2076+
"deprecatedAuthMethod",
20772077
"Check for deprecated or invalid user authentication methods.",
20782078
std::vector<std::string>{
20792079
"SELECT CONCAT(user, '@', host), plugin FROM "
@@ -2105,7 +2105,7 @@ class Deprecated_auth_method_check : public Sql_upgrade_check {
21052105
Deprecated_default_auth_check::Deprecated_default_auth_check(
21062106
mysqlshdk::utils::Version target_ver)
21072107
: Sql_upgrade_check(
2108-
"mysqlDeprecatedDefaultAuthCheck",
2108+
"deprecatedDefaultAuth",
21092109
"Check for deprecated or invalid default authentication methods in "
21102110
"system variables.",
21112111
std::vector<std::string>{

res/upgrade_checker/upgrade_checker.msg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# the table using 'ALTER TABLE <table_name> FORCE' command
4343

4444
* oldTemporalCheck.docLink
45-
https://mysqlserverteam.com/mysql-8-0-removing-support-for-old-temporal-datatypes/
45+
https://dev.mysql.com/blog-archive/mysql-8-0-removing-support-for-old-temporal-datatypes/
4646

4747
* routinesSyntaxCheck.title
4848
# MySQL 8.0 syntax check for routine-like objects
@@ -222,7 +222,7 @@ https://dev.mysql.com/doc/refman/8.0/en/added-deprecated-removed.html#optvars-re
222222
# performing upgrade.
223223

224224
* sysVarsNewDefaults.docLink
225-
https://mysqlserverteam.com/new-defaults-in-mysql-8-0/
225+
https://dev.mysql.com/blog-archive/new-defaults-in-mysql-8-0/
226226

227227
* zeroDatesCheck.title
228228
# Zero Date, Datetime, and Timestamp values

unittest/modules/upgrade_check_t.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -897,8 +897,9 @@ TEST_F(MySQL_upgrade_check_test, sys_vars_new_defaults) {
897897

898898
std::unique_ptr<Upgrade_check> check =
899899
Sql_upgrade_check::get_sys_vars_new_defaults_check();
900-
EXPECT_EQ(0, strcmp("https://mysqlserverteam.com/new-defaults-in-mysql-8-0/",
901-
check->get_doc_link()));
900+
EXPECT_EQ(
901+
0, strcmp("https://dev.mysql.com/blog-archive/new-defaults-in-mysql-8-0/",
902+
check->get_doc_link()));
902903

903904
EXPECT_THROW_LIKE(
904905
check->run(session, info), Upgrade_check::Check_configuration_error,
@@ -1885,11 +1886,9 @@ TEST_F(MySQL_upgrade_check_test, deprecated_auth_method_json_check) {
18851886
ASSERT_TRUE(check.IsObject());
18861887
ASSERT_TRUE(check.HasMember("id"));
18871888
ASSERT_TRUE(check["id"].IsString());
1888-
if (std::string(check["id"].GetString()) ==
1889-
"mysqlDeprecatedAuthMethodCheck")
1889+
if (std::string(check["id"].GetString()) == "deprecatedAuthMethod")
18901890
found_dep_auth_check_id = true;
1891-
if (std::string(check["id"].GetString()) ==
1892-
"mysqlDeprecatedDefaultAuthCheck")
1891+
if (std::string(check["id"].GetString()) == "deprecatedDefaultAuth")
18931892
found_def_auth_check_id = true;
18941893
}
18951894
EXPECT_TRUE(found_dep_auth_check_id);

0 commit comments

Comments
 (0)