1 files changed, 8 insertions, 8 deletions
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index 59cc817a302..43a30538384 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -4,7 +4,7 @@
     Id="*" 
     UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"
     Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@" 
-    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@" 
+    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 
     Language="1033" 
     Manufacturer="@MANUFACTURER@">
     
@@ -25,12 +25,12 @@
       <UpgradeVersion 
         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
         IncludeMinimum="yes"
-        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
+        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
         Property="OLDERVERSIONBEINGUPGRADED"
         MigrateFeatures="yes"
         />
       <UpgradeVersion 
-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
+        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
         OnlyDetect="yes"
         Property="NEWERVERSIONDETECTED" />
     </Upgrade>
@@ -128,10 +128,10 @@
                   Impersonate="no"
                   Return="check" />
     <InstallExecuteSequence>
-      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>
-      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>
-      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And UILevel&gt;4</Custom>
-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And UILevel&lt;=4</Custom>
+      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>
+      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>
     </InstallExecuteSequence>
 
     <!-- Installation root-->
@@ -160,4 +160,4 @@
     @CPACK_WIX_INCLUDES@
   </Product>
 
-</Wix>
-\ No newline at end of file
+</Wix>