Merge branch 'mysql-5.7.7-rc-release' into mysql-5.7

Conflicts:
	mysql-test/r/show_variables.result
	mysql-test/suite/perfschema/r/show_coverage.result
	mysql-test/suite/perfschema/r/show_sanity.result
	sql/sql_show.cc
	storage/innobase/fil/fil0fil.cc

Author: bjornmu

packaging/WiX/mysql_server_extra.wxs.in

@@ -79,6 +79,10 @@
           Type="string"
           Name="Version"
           Value="[ProductVersion]"/>
+        <RegistryValue
+          Type="string"
+          Name="DataLocation"
+          Value="[DATADIR]"/>
       </RegistryKey>
     </Component>
     </DirectoryRef>

packaging/solaris/postinstall-solaris.sh

@@ -82,7 +82,7 @@ if [ -n "$INSTALL" ] ; then
   # We install/update the system tables
   (
     cd "$mybasedir"
-    sbin/mysqld --initialize \
+    bin/mysqld --initialize \
 	  --user=mysql \
 	  --basedir="$mybasedir" \
 	  --datadir=$mydatadir