Fixed registry search logic

Author: sreedhars

packaging/WiX/CMakeLists.txt

@@ -100,7 +100,7 @@ SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs;${CMAK
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(WixWin64 " Win64='yes'")
 ELSE()
-  SET(WixWin64)
+  SET(WixWin64 " Win64='no'")
 ENDIF()
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in

packaging/WiX/create_msi.cmake.in

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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
@@ -59,7 +59,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 ELSE()
   SET(Platform x86)
   SET(PlatformProgramFilesFolder ProgramFilesFolder)
-  SET(Win64)
+  SET(Win64 " Win64='no'")
 ENDIF()
 
 SET(ENV{VS_UNICODE_OUTPUT})

packaging/WiX/mysql_server.wxs.in

@@ -92,29 +92,19 @@
     <Property Id="INSTALLDIR">
       <RegistrySearch Id="FindInstallLocation"
           Root="HKLM"
+          @Win64@
           Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
           Name="InstallLocation"
           Type="raw" />
     </Property>
-    <?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="OLDERVERSION"> 
+      <RegistrySearch Id="FindOlderVersion"
+        Root="HKLM"
+        @Win64@
+        Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+        Name="DisplayVersion"
+        Type="raw" />
+    </Property>
     <Property Id="DATADIR">
       <RegistrySearch Id="FindDataDir"
           Root="HKLM"