summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-09-25 15:58:08 +0300
committerDaniel Black <daniel@mariadb.org>2020-09-26 08:57:56 +1000
commite0f5e7bc9ef306a76c5bf4e067ee5c1a9a7b6187 (patch)
treeb7adc0b47f1d7533fcde387d21760dfdcfa53f40 /client
parent1be8ac390d3665d061141fe50a1c9e63b7b4b294 (diff)
downloadmariadb-git-e0f5e7bc9ef306a76c5bf4e067ee5c1a9a7b6187.tar.gz
Reverted wrong patch for mysql_upgradebb-10.1-danielblack-mysqlupgrade-revert
The original code was correct. mysql_upgrade calls the mysql client to talk with MariaDB. It doesn't call itself!
Diffstat (limited to 'client')
-rw-r--r--client/mysql_upgrade.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 9cc12c8d7e7..d18dc97c9b8 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -1108,7 +1108,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 */
}