diff options
author | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-09-28 14:03:46 +0530 |
---|---|---|
committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-09-28 14:03:46 +0530 |
commit | 3a5e719e00fde2690f5a58af21d84d895a510c5e (patch) | |
tree | 19f8fd2c071ed4b96ed77bdea28b27ab8ed3029a /client | |
parent | c078f55f47eba8660f6daed6d0c2000694159a6c (diff) | |
parent | 15cd9195353282e54e109962d46e1900c9eff3d4 (diff) | |
download | mariadb-git-3a5e719e00fde2690f5a58af21d84d895a510c5e.tar.gz |
Merge branch '10.1' into 10.2
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 13d7b3035dd..227b66e8c86 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -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 */ } |