VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-16 18:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '10.7' into 10.8

Browse Source 
# Conflicts:
#	storage/innobase/btr/btr0pcur.cc
#	storage/innobase/log/log0log.cc
This commit is contained in:
Vladislav Vaintroub
2022-02-17 12:43:29 +01:00
parent 8251a9fb93 38a8ac1951
commit eb25f47423
22 changed files with 362 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
win/packaging/extra.wxs.in
View File

@ -652,15 +652,15 @@
<CustomAction Id='ErrorDataDir'
Error='Invalid data directory, choose a different one. Error : [DATADIRERROR]'/>
<CustomAction Id="ErrorInstallDir"
Error="[INSTALLDIRERROR]" />
<CustomAction Id="ErrorInstallDir"
Error="[INSTALLDIRERROR]" />
<InstallExecuteSequence>
<Custom Action="CheckDataDirectory" After="CostFinalize">
<![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
</Custom>
<Custom Action="ErrorDataDir" After="CheckDataDirectory">DATADIRERROR</Custom>
<Custom Action="CheckInstallDirectory" After="CostFinalize">
NOT Installed
<Custom Action="ErrorDataDir" After="CheckDataDirectory">DATADIRERROR</Custom>
<Custom Action="CheckInstallDirectory" After="CostFinalize">
NOT Installed AND OLDERVERSIONBEINGUPGRADED=""
</Custom>
<Custom Action="ErrorInstallDir" After="CheckInstallDirectory">INSTALLDIRERROR</Custom>
<Custom Action="CheckDatabaseProperties" Before="CreateDatabaseCommand">SERVICENAME</Custom>