VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-23 00:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-13 11:11:04 +02:00
parent 92c8d6f168 1e04cafcba
commit 88c35781cc
86 changed files with 1860 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win/packaging/ca/CustomAction.cpp
View File

@ -202,7 +202,11 @@ extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE hInstall)
swprintf(msg,countof(msg), L"Installation directory '%s' exists and is not empty. Choose a "
"different install directory",path);
WcaSetProperty(L"INSTALLDIRERROR", msg);
goto LExit;
}
WcaSetProperty(L"INSTALLDIRERROR", L"");
LExit:
ReleaseStr(path);
return WcaFinalize(er);