From e9e6b2398743eda80bd9084effd4b0365ad81682 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon, 14 Feb 2022 12:04:08 +0100
Subject: [PATCH] MDEV-27828 : Windows - major MSI upgrade fails, complaining
 that install directory not empty

---
 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 8b06ea1c24d..ae9b3d9f0a8 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -660,7 +660,7 @@
       </Custom>
 	  <Custom Action="ErrorDataDir" After="CheckDataDirectory">DATADIRERROR</Custom>
 	  <Custom Action="CheckInstallDirectory" After="CostFinalize">
-        NOT Installed
+        NOT Installed AND OLDERVERSIONBEINGUPGRADED=""
       </Custom>
       <Custom Action="ErrorInstallDir" After="CheckInstallDirectory">INSTALLDIRERROR</Custom>
       <Custom Action="CheckDatabaseProperties" Before="CreateDatabaseCommand">SERVICENAME</Custom>