diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2022-02-17 12:43:29 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2022-02-17 12:43:29 +0100 |
| commit | eb25f47423d64bc038e67bf7895bc6663ee4f1c3 (patch) | |
| tree | ada8e2b039df322e3cf89216324f177f09824a9b /win | |
| parent | 8251a9fb93075a72074bd7fd10faee5165014b7f (diff) | |
| parent | 38a8ac19510b08ecea0b33cba887775b47a58267 (diff) | |
| download | mariadb-git-eb25f47423d64bc038e67bf7895bc6663ee4f1c3.tar.gz | |
Merge branch '10.7' into 10.8
# Conflicts:
# storage/innobase/btr/btr0pcur.cc
# storage/innobase/log/log0log.cc
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/extra.wxs.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 44e45951d4a..056a7ec43ab 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -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> |