Don't run upgrade-views if not mysql or --upgrade-system-tables

4987080d · Daniel Black · 97e0aeaf · 4987080d
Commit 4987080d authored Apr 14, 2015 by Daniel Black
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

client/mysql_upgrade.c client/mysql_upgrade.c +5 -0

No files found.
--- 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);