diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-04 14:47:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-06 11:45:23 +0100 |
| commit | ad94790f468bacb2cd62d02d3a6e7f012ca72e65 (patch) | |
| tree | 6b4a062758539aa1078396e681ed843726442242 /client | |
| parent | 0a76ad5ffd04fdfdf77435f4c9e733c2a59a14d8 (diff) | |
| download | mariadb-git-ad94790f468bacb2cd62d02d3a6e7f012ca72e65.tar.gz | |
MDEV-9453 mysql_upgrade.exe error when mysql is migrated to mariadb
mysqlcheck tool can be used even if opt_systables_only is true
(to upgrade views from mysql - that overrides opt_systables_only)
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 0be8f91af59..bc9b3c5b149 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1051,16 +1051,11 @@ int main(int argc, char **argv) /* Find mysql */ find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name); - if (!opt_systables_only) - { - /* Find mysqlcheck */ - find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name); - } - else - { - if (!opt_silent) - printf("The --upgrade-system-tables option was used, databases won't be touched.\n"); - } + /* Find mysqlcheck */ + find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name); + + if (opt_systables_only && !opt_silent) + printf("The --upgrade-system-tables option was used, user tables won't be touched.\n"); /* Read the mysql_upgrade_info file to check if mysql_upgrade |