From edf9757cb846f494e75efe297b863a1a7613976d Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Fri, 4 Feb 2011 12:16:23 +0100
Subject: [PATCH] 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.

---
 win/packaging/extra.wxs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.&#xD;&#xA;Please remove &quot;[NSISINSTALLKEY]&quot; 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.'>