mysql_upgrade test fixed

per-file comments:
  mysql-test/r/mysql_upgrade.result
     result updated
  mysql-test/t/mysql_upgrade.test
     --skip-verbose option added to the call

mysql-test/r/mysql_upgrade.result

@@ -127,7 +127,4 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
 set GLOBAL sql_mode=default;
-Looking for 'mysql' as: /home/hf/work/mysql_common/wl4991/client/mysql
 The --upgrade-system-tables option was used, databases won't be touched.
-Running 'mysql_fix_privilege_tables'...
-OK

mysql-test/t/mysql_upgrade.test

@@ -93,5 +93,6 @@ eval set GLOBAL sql_mode=default;
 #
 # Test the --upgrade-system-tables option
 #
---exec $MYSQL_UPGRADE --upgrade-system-tables
+--replace_result $MYSQLTEST_VARDIR var
+--exec $MYSQL_UPGRADE --skip-verbose --upgrade-system-tables