mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 11:27:39 +02:00
Merge branch '10.1' into 10.2
This commit is contained in:
commit
3a5e719e00
19 changed files with 103 additions and 24 deletions
|
|
@ -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 */
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue