mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge 10.7 into 10.8
This commit is contained in:
commit
88c35781cc
86 changed files with 1859 additions and 656 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue