Merge mysql.com:/d2/hf/common/my50-common

into  mysql.com:/d2/hf/common/my51-common


mysql-test/r/flush_block_commit_notembedded.result:
  merging

mysql-test/t/mysql_upgrade.test

+# Can't run test of external client with embedded server
+-- source include/not_embedded.inc
+
 # Only run test if "mysql_upgrade" is found
 --require r/have_mysql_upgrade.result
 --disable_query_log