diff options
| author | Sergey Vojtovich <svoj@mysql.com> | 2008-12-09 13:29:59 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mysql.com> | 2008-12-09 13:29:59 +0400 |
| commit | 86c976f803c42f540ed783eb748745178077fe4b (patch) | |
| tree | a49aec3ef51be2acb4270a9212949ac1a7ab55f5 | |
| parent | 0e62ee8e798008696c1c376081e08a72773e4519 (diff) | |
| parent | 3a5fe88d02a5ecd4048d144f12db36bb7aef5d4f (diff) | |
| download | mariadb-git-86c976f803c42f540ed783eb748745178077fe4b.tar.gz | |
Merge.
| -rw-r--r-- | client/mysql_upgrade.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index e1fc4caf720..190bb2383e9 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -616,6 +616,18 @@ static int run_mysqlcheck_upgrade(void) "--check-upgrade", "--all-databases", "--auto-repair", + NULL); +} + + +static int run_mysqlcheck_fixnames(void) +{ + verbose("Running 'mysqlcheck'..."); + return run_tool(mysqlcheck_path, + NULL, /* Send output from mysqlcheck directly to screen */ + "--no-defaults", + ds_args.str, + "--all-databases", "--fix-db-names", "--fix-table-names", NULL); @@ -784,7 +796,8 @@ int main(int argc, char **argv) /* Run "mysqlcheck" and "mysql_fix_privilege_tables.sql" */ - if (run_mysqlcheck_upgrade() || + if (run_mysqlcheck_fixnames() || + run_mysqlcheck_upgrade() || run_sql_fix_privilege_tables()) { /* |