Tests that use upgrade include framework failing.

CURRENT_TEST: rocksdb.upgrade_parts_from_prev_ver
--- /.../mysql-test/suite/rocksdb/r/upgrade_parts_from_prev_ver.result 2019-07-04 01:11:22.000000000 +0300
+++ /.../mysql-test/var/2/log/upgrade_parts_from_prev_ver.reject 2019-07-04 21:08:39.715401510 +0300
@@ -8,42 +8,10 @@
 # Remove copied files
 # restart:<hidden args>
 # Execute mysql_upgrade
-mysql.columns_priv                                 OK   
-mysql.component                                    OK   
-mysql.db                                           OK   
-mysql.default_roles                                OK   
-mysql.engine_cost                                  OK   
-mysql.func                                         OK   
-mysql.general_log                                  OK   
-mysql.global_grants                                OK   
-mysql.gtid_executed                                OK   
-mysql.help_category                                OK   
-mysql.help_keyword                                 OK   
-mysql.help_relation                                OK   
-mysql.help_topic                                   OK   
-mysql.innodb_index_stats                           OK   
-mysql.innodb_table_stats                           OK   
-mysql.ndb_binlog_index                             OK   
-mysql.password_history                             OK   
-mysql.plugin                                       OK   
-mysql.procs_priv                                   OK   
-mysql.proxies_priv                                 OK   
-mysql.role_edges                                   OK   
-mysql.server_cost                                  OK   
-mysql.servers                                      OK   
-mysql.slave_master_info                            OK   
-mysql.slave_relay_log_info                         OK   
-mysql.slave_worker_info                            OK   
-mysql.slow_log                                     OK   
-mysql.tables_priv                                  OK   
-mysql.time_zone                                    OK   
-mysql.time_zone_leap_second                        OK   
-mysql.time_zone_name                               OK   
-mysql.time_zone_transition                         OK   
-mysql.time_zone_transition_type                    OK   
-mysql.user                                         OK   
-sys.sys_config                                     OK   
-test.t1                                            OK   
+The mysql_upgrade client is now deprecated. The actions executed by the upgrade client are now done by the server.
+To upgrade, please start the new MySQL binary with the older data directory. Repairing user tables is done automatically. Restart is not required after upgrade.
+The upgrade process automatically starts on running a new MySQL binary with an older data directory. To avoid accidental upgrades, please use the --upgrade=NONE option with the MySQL binary. The option --upgrade=FORCE is also provided to run the server upgrade sequence on demand.
+It may be possible that the server upgrade fails due to a number of reasons. In that case, the upgrade sequence will run again during the next MySQL server start. If the server upgrade fails repeatedly, the server can be started with the --upgrade=MINIMAL option to start the server without executing the upgrade sequence, thus allowing users to manually rectify the problem.
 #########
 # Performing test specific validation
 ###mysqltest: Result content mismatch