From 4af85875de2697e4f6b6e0a974176ecbfd8f6a43 Mon Sep 17 00:00:00 2001
From: Daniel Fischer <daniel.fischer@oracle.com>
Date: Wed, 20 Feb 2013 12:41:43 +0100
Subject: [PATCH] Bug #13071597: MYSQL SERVER COMMUNITY TO ADVANCED USING MSI
 THE INSTALLER

Cross-upgrades between GPL and commercial versions should be allowed by
the MSI package even when both packages are the same version.

Fixed by allowing upgrades to the same numeric version.
---
 packaging/WiX/mysql_server.wxs.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index 4c2a856782c..752dc15304e 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -45,11 +45,13 @@
         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
         IncludeMinimum="yes"
         Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
+        IncludeMaximum="yes"
         Property="OLDERVERSIONBEINGUPGRADED"
         MigrateFeatures="yes"
         />
       <UpgradeVersion 
         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
+        IncludeMinimum="no"
         OnlyDetect="yes"
         Property="NEWERVERSIONDETECTED" />
     </Upgrade>