diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 15:21:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 15:21:43 +0300 |
| commit | 9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (patch) | |
| tree | 87992f23022a4fdd0e722ced5388e0fe0ea1a5e9 /client | |
| parent | 78efa1093076307946873f322b45a14d1ed5ffb0 (diff) | |
| parent | 4c19227929b0d86616337585fb95a4bb8fe0d4b2 (diff) | |
| download | mariadb-git-9d0ee2dcb72c011b4ee73c578cc32b666297ca31.tar.gz | |
Merge 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 227b66e8c86..13d7b3035dd 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' command line client", &ds_version); + "the 'mysql_upgrade' command line client", &ds_version); dynstr_free(&ds_version); return 1; /* Query failed */ } |