From 4987080ddb42abf1a9111bd6a79e7bed746b66ff Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 14 Apr 2015 13:26:22 +1000 Subject: Don't run upgrade-views if not mysql or --upgrade-system-tables --- client/mysql_upgrade.c | 5 +++++ 1 file changed, 5 insertions(+) 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); -- cgit v1.2.1