diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-04 12:16:23 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-04 12:16:23 +0100 |
| commit | edf9757cb846f494e75efe297b863a1a7613976d (patch) | |
| tree | 7aad3306629d9f164c9905cf32f3dec9f6eef66e /win | |
| parent | 074dc9a550e110810bb62fb4c709811d29cd0c91 (diff) | |
| download | mariadb-git-edf9757cb846f494e75efe297b863a1a7613976d.tar.gz | |
MWL#55 :
Allow MSI and NSIS side-by-side installation if installed NSIS package
differs in "major.minor" version numbers. Still disallow MSI and NSIS
if major.minor versions of both packages match.
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/extra.wxs.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 826fcc40e64..3ec03636213 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -637,7 +637,7 @@ Message=
'Previous version of MariaDB was found, that used incompatible installer.
Please remove "[NSISINSTALLKEY]" before you proceed with this installation.'
>
- NOT NSISINSTALLKEY OR Installed
+ <![CDATA[ NOT(NSISINSTALLKEY << "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@.") OR Installed]]>
</Condition>
<Condition Message=
'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'>
|