mysqlcheck fix-view-algorithm -> upgrade-views

Change mysqlcheck option to upgrade-views={NO,YES,FROM_MYSQL}

mysql_upgrade now runs upgrade-views=yes to perform a checksum of all
views and add mariadb-version by default. upgrade-views=from_mysql if
MySQL is detected as teh origin version.

1 files changed, 8 insertions, 8 deletions

diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 78e49362032..502242a9845 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -1,5 +1,5 @@
 Run mysql_upgrade once
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -37,7 +37,7 @@ OK
 Run it again - should say already completed
 This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
 Force should run it regardless of wether it's been run before
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -75,7 +75,7 @@ OK
 CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
 GRANT ALL ON *.* TO mysqltest1@'%';
 Run mysql_upgrade with password protected account
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -118,7 +118,7 @@ Run mysql_upgrade with a non existing server socket
 mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
 FATAL ERROR: Upgrade failed
 set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -162,7 +162,7 @@ CREATE PROCEDURE testproc() BEGIN END;
 UPDATE mysql.proc SET character_set_client = NULL WHERE name LIKE 'testproc';
 UPDATE mysql.proc SET collation_connection = NULL WHERE name LIKE 'testproc';
 UPDATE mysql.proc SET db_collation = NULL WHERE name LIKE 'testproc';
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -209,7 +209,7 @@ WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been
 GRANT USAGE ON *.* TO 'user3'@'%';
 GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%';
 Run mysql_upgrade with all privileges on a user
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -259,7 +259,7 @@ OK
 #
 # Droping the previously created mysql_upgrade_info file..
 # Running mysql_upgrade with --skip-write-binlog..
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases
@@ -320,7 +320,7 @@ GRANT INSERT ON mysql.user TO very_long_user_name_number_2;
 GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_1;
 GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_2;
 CREATE PROCEDURE test.pr() BEGIN END;
-Phase 1/4: Fixing views - skipped - not required
+Phase 1/4: Fixing views
 Phase 2/4: Fixing table and database names
 Phase 3/4: Checking and upgrading tables
 Processing databases