diff options
| author | Sreedhar.S <sreedhar.sreedhargadda@oracle.com> | 2016-04-14 14:18:23 +0530 |
|---|---|---|
| committer | Sreedhar.S <sreedhar.sreedhargadda@oracle.com> | 2016-04-14 14:18:23 +0530 |
| commit | b4afc6a7a94a60980eac15dad385cd29ad1dd816 (patch) | |
| tree | 5146950483e343781a47a0e362447188af3fbd50 | |
| parent | 17d32a1d45c5ab38193281c0f5d5202cc2c0ac65 (diff) | |
| download | mariadb-git-b4afc6a7a94a60980eac15dad385cd29ad1dd816.tar.gz | |
Fix for Bugs#14583183 and 19949163
| -rw-r--r-- | packaging/WiX/mysql_server.wxs.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in index 1802baedf3b..10b6f892a2e 100644 --- a/packaging/WiX/mysql_server.wxs.in +++ b/packaging/WiX/mysql_server.wxs.in @@ -2,7 +2,7 @@ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<!--
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -76,13 +76,17 @@ </InstallUISequence>
<!-- Find previous installation -->
- <Property Id="INSTALLDIR">
+ <Property Id="GETINSTALLDIR">
<RegistrySearch Id="FindInstallLocation"
Root="HKLM"
Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
Name="InstallLocation"
Type="raw" />
</Property>
+ <CustomAction Id="SetInstall" Property="INSTALLDIR" Value="[GETINSTALLDIR]" />
+ <InstallUISequence>
+ <Custom Action="SetInstall" After="AppSearch">Installed</Custom>
+ </InstallUISequence>
<?if @Platform@ != "x64" ?>
<Property Id="OLDERVERSION">
<RegistrySearch Id="FindOlderVersion"
|