diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2015-04-14 13:26:22 +1000 |
|---|---|---|
| committer | Daniel Black <grooverdan@users.sourceforge.net> | 2015-04-14 13:26:22 +1000 |
| commit | 4987080ddb42abf1a9111bd6a79e7bed746b66ff (patch) | |
| tree | 0cf956e1800212bfa99cdcb1c4f36abbc3b396e1 | |
| parent | 97e0aeaf72cde117b8d9551f68d407fa13aafbe1 (diff) | |
| download | mariadb-git-4987080ddb42abf1a9111bd6a79e7bed746b66ff.tar.gz | |
Don't run upgrade-views if not mysql or --upgrade-system-tables
| -rw-r--r-- | client/mysql_upgrade.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 98021dda377..97e2ad92239 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -790,6 +790,11 @@ static int run_mysqlcheck_views(void) upgrade_views="--upgrade-views=FROM_MYSQL"; verbose("Phase %d/%d: Fixing views from mysql", phase++, phases_total); } + else if (opt_systables_only) + { + verbose("Phase %d/%d: Fixing views - skipped - not required", phase++, phases_total); + return 0; + } else verbose("Phase %d/%d: Fixing views", phase++, phases_total); |