diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 21:12:48 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 21:12:48 +0300 |
commit | d9d9c30b707d7634503c8d3bce7dab7f7ec3fd34 (patch) | |
tree | dd112cca32b4cbc18980788ad591a61b41add71e /client | |
parent | fde3d895d9dca494be9fa077835fb2f606a5f3d0 (diff) | |
parent | 9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (diff) | |
download | mariadb-git-d9d9c30b707d7634503c8d3bce7dab7f7ec3fd34.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'client')
-rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 26fa275dacd..619fe07505b 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1173,7 +1173,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' command line client", &ds_version); + "the 'mysql_upgrade' command line client", &ds_version); dynstr_free(&ds_version); return 1; /* Query failed */ } |