summaryrefslogtreecommitdiff
path: root/packaging
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
commit286a7490c7d6de6c731b760737ecc7c3aec397eb (patch)
tree9de9f114f10b9373b030d7529c9bdadfd3ae4c5f /packaging
parent1048aed515524a7c6981abcfbc8984011c3c2b16 (diff)
downloadmariadb-git-286a7490c7d6de6c731b760737ecc7c3aec397eb.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.
Diffstat (limited to 'packaging')
-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>