Merge branch '10.1' into 10.2

This commit is contained in:
Sujatha 2020-09-28 14:03:46 +05:30
commit 3a5e719e00
19 changed files with 103 additions and 24 deletions

View file

@ -1166,7 +1166,7 @@ static int check_version_match(void)
extract_variable_from_show(&ds_version, version_str))
{
print_error("Version check failed. Got the following error when calling "
"the 'mysql_upgrade' command line client", &ds_version);
"the 'mysql' command line client", &ds_version);
dynstr_free(&ds_version);
return 1; /* Query failed */
}