Bug#25252679 : ENABLE MAIN.MYSQL_UPGRADE.TEST

- Enable main.mysql_upgrade.test
- Record result file according to latest trunk.
- Divide main.mysql_upgrade test case into four tests
  main.mysql_upgrade.test
  main.mysql_upgrade_options.test
  main.mysql_upgrade_grant.test
  main.ps_sys_upgrade.test
- Mark main.mysql_upgrade_options and main.ps_sys_upgrade
  as big test. Add 60 min timeout values for these tests.
- Create on disk tables instead of temporary tables from
  backup_tables_priv_and_users.inc to handle server restarts.

Author: abhi5466

mysql-test/include/backup_tables_priv_and_users.inc

@@ -15,8 +15,8 @@
 if ($backup)
 {
   # Save a copy of the user/tables_priv tables, to restore later
-  CREATE TEMPORARY TABLE tmp_backup_tables_priv AS SELECT * FROM mysql.tables_priv;
-  CREATE TEMPORARY TABLE tmp_backup_user AS SELECT * FROM mysql.user;
+  CREATE TABLE mysql.tmp_backup_tables_priv AS SELECT * FROM mysql.tables_priv;
+  CREATE TABLE mysql.tmp_backup_user AS SELECT * FROM mysql.user;
 
   # Reset the backup flag
   --let $backup= 0;
@@ -26,12 +26,12 @@ if ($restore)
 {
   # Restore the saved contents of mysql.tables_priv and mysql.user
   TRUNCATE TABLE mysql.tables_priv;
-  INSERT INTO mysql.tables_priv (SELECT * FROM tmp_backup_tables_priv);
-  DROP TEMPORARY TABLE tmp_backup_tables_priv;
+  INSERT INTO mysql.tables_priv (SELECT * FROM mysql.tmp_backup_tables_priv);
+  DROP TABLE mysql.tmp_backup_tables_priv;
 
   TRUNCATE TABLE mysql.user;
-  INSERT INTO mysql.user (SELECT * FROM tmp_backup_user);
-  DROP TEMPORARY TABLE tmp_backup_user;
+  INSERT INTO mysql.user (SELECT * FROM mysql.tmp_backup_user);
+  DROP TABLE mysql.tmp_backup_user;
 
   # Reset the restore flag
   --let $restore= 0;