diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
| commit | 2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f (patch) | |
| tree | faaec8693d4aa4ba3a71c11a6143fc8d08d1fa95 /client/mysql_upgrade.c | |
| parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
| parent | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff) | |
| download | mariadb-git-2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f.tar.gz | |
Merge branch '10.7' into 10.8
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 0834bfc6128..d026c347c82 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -935,7 +935,7 @@ static int run_mysqlcheck_upgrade(my_bool mysql_db_only) return 0; } verbose("Phase %d/%d: Checking and upgrading %s", ++phase, phases_total, what); - print_conn_args("mysqlcheck"); + print_conn_args("mariadb-check"); retch= run_tool(mysqlcheck_path, NULL, /* Send output from mysqlcheck directly to screen */ defaults_file, @@ -1451,7 +1451,7 @@ int main(int argc, char **argv) } /* Find mysql */ - find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name); + find_tool(mysql_path, IF_WIN("mariadb.exe", "mariadb"), self_name); open_mysql_upgrade_file(); @@ -1459,7 +1459,7 @@ int main(int argc, char **argv) exit(upgrade_already_done(0) == 0); /* Find mysqlcheck */ - find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name); + find_tool(mysqlcheck_path, IF_WIN("mariadb-check.exe", "mariadb-check"), self_name); if (opt_systables_only && !opt_silent) printf("The --upgrade-system-tables option was used, user tables won't be touched.\n"); |