From 1fc8cbec49ab3eaeecdf283be86fe9024ed65dfc Mon Sep 17 00:00:00 2001
From: "Sreedhar.S" <sreedhar.sreedhargadda@oracle.com>
Date: Mon, 30 Sep 2013 12:41:22 +0530
Subject: [PATCH] Fix for Bug:16053094       Registry redirection was improper
 and hence not able to pick the value for the OLDERVERSION property. as a
 result in the install upgrade dialog null value wa being passed.

---
 packaging/WiX/mysql_server.wxs.in | 42 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index 752dc15304e..65688838316 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -70,10 +70,10 @@
         Installed
       </Custom>
     </InstallExecuteSequence>
-	<InstallUISequence>
+    <InstallUISequence>
       <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
       <AppSearch After="FindRelatedProducts"/>
-	</InstallUISequence>
+    </InstallUISequence>
  
     <!-- Find previous installation -->
     <Property Id="INSTALLDIR">
@@ -83,31 +83,43 @@
           Name="InstallLocation"
           Type="raw" />
     </Property>
-	 <Property Id="OLDERVERSION">
-      <RegistrySearch Id="FindOlderVersion"
-          Root="HKLM"
-          Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
-          Name="DisplayVersion"
-          Type="raw" />
-    </Property>
-	 <Property Id="DATADIR">
+    <?if @Platform@ != "x64" ?>
+        <Property Id="OLDERVERSION"> 
+          <RegistrySearch Id="FindOlderVersion"
+            Root="HKLM"
+            Win64 = "no"
+            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+            Name="DisplayVersion"
+            Type="raw" />
+        </Property>
+    <?else ?>
+        <Property Id="OLDERVERSION"> 
+          <RegistrySearch Id="FindOlderVersion"
+            Root="HKLM"
+            Win64 = "yes"
+            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+            Name="DisplayVersion"
+            Type="raw" />
+        </Property>
+    <?endif ?>
+    <Property Id="DATADIR">
       <RegistrySearch Id="FindDataDir"
           Root="HKLM"
           Key="SOFTWARE\MySQL AB\[ProductName]"
           Name="DataLocation"
           Type="raw" />
     </Property>
-	 <Property Id="INSTALLDIR2">
+    <Property Id="INSTALLDIR2">
        <RegistrySearch Id="FindInstallLocation2"
           Root="HKLM"
           Key="SOFTWARE\MySQL AB\[ProductName]"
           Name="Location"
           Type="raw" />
     </Property>
-	<CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
-	<InstallUISequence>
-	 <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
-	</InstallUISequence>
+    <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
+    <InstallUISequence>
+    <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
+    </InstallUISequence>
 
 
     <!-- UI -->