diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-13 18:28:36 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-13 18:28:36 -0500 |
| commit | d23bd26bec787ebbdbd41be0204e9cb83baf4dbd (patch) | |
| tree | dda05b0ebb3858e913b0ca3b864705e989bb7661 /client/mysql_upgrade.c | |
| parent | b83de1151aab6dcc9f300159e31198364000de70 (diff) | |
| parent | a9a08b1e2f5b7a9e3ab7c7f75c768389b1d8238f (diff) | |
| download | mariadb-git-d23bd26bec787ebbdbd41be0204e9cb83baf4dbd.tar.gz | |
Merge tag 'mariadb-5.5.48' into 5.5-galera
Diffstat (limited to 'client/mysql_upgrade.c')
| -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 1298a4fc5de..9082c87883a 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1056,16 +1056,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 |