summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Fischer <daniel.fischer@oracle.com>2013-02-20 12:41:43 +0100
committerDaniel Fischer <daniel.fischer@oracle.com>2013-02-20 12:41:43 +0100
commit4af85875de2697e4f6b6e0a974176ecbfd8f6a43 (patch)
tree9de9f114f10b9373b030d7529c9bdadfd3ae4c5f
parent92f81439a91964e7b875c6975c97069c92fe29fc (diff)
downloadmariadb-git-4af85875de2697e4f6b6e0a974176ecbfd8f6a43.tar.gz
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.
-rw-r--r--packaging/WiX/mysql_server.wxs.in2
1 files changed, 2 insertions, 0 deletions
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>