Merge branch 'mysql-5.5' into mysql-5.6

Author: sreedhars

packaging/WiX/mysql_server.wxs.in

@@ -2,7 +2,7 @@
       xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -89,13 +89,17 @@
     </InstallUISequence>
 
     <!-- Find previous installation -->
-    <Property Id="INSTALLDIR">
+    <Property Id="GETINSTALLDIR">
       <RegistrySearch Id="FindInstallLocation"
           Root="HKLM"
           Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
           Name="InstallLocation"
           Type="raw" />
     </Property>
+    <CustomAction Id="SetInstall"    Property="INSTALLDIR" Value="[GETINSTALLDIR]" />
+    <InstallUISequence>
+       <Custom Action="SetInstall"    After="AppSearch">Installed</Custom>
+    </InstallUISequence>
     <?if @Platform@ != "x64" ?>
         <Property Id="OLDERVERSION"> 
           <RegistrySearch Id="FindOlderVersion"