1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for Bugs#14583183 and 19949163

Browse Source
This commit is contained in:
Sreedhar.S 2016-04-14 14:18:23 +05:30
parent 17d32a1d45
commit b4afc6a7a9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/WiX/mysql_server.wxs.in
View File

@ -2,7 +2,7 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> 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 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 it under the terms of the GNU General Public License as published by
@ -76,13 +76,17 @@
</InstallUISequence> </InstallUISequence>
<!-- Find previous installation --> <!-- Find previous installation -->
<Property Id="INSTALLDIR"> <Property Id="GETINSTALLDIR">
<RegistrySearch Id="FindInstallLocation" <RegistrySearch Id="FindInstallLocation"
Root="HKLM" Root="HKLM"
Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
Name="InstallLocation" Name="InstallLocation"
Type="raw" /> Type="raw" />
</Property> </Property>
<CustomAction Id="SetInstall" Property="INSTALLDIR" Value="[GETINSTALLDIR]" />
<InstallUISequence>
<Custom Action="SetInstall" After="AppSearch">Installed</Custom>
</InstallUISequence>
<?if @Platform@ != "x64" ?> <?if @Platform@ != "x64" ?>
<Property Id="OLDERVERSION"> <Property Id="OLDERVERSION">
<RegistrySearch Id="FindOlderVersion" <RegistrySearch Id="FindOlderVersion"