Skip to content

Commit b4afc6a

Browse files
committed
Fix for Bugs#14583183 and 19949163
1 parent 17d32a1 commit b4afc6a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

packaging/WiX/mysql_server.wxs.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

44
<!--
5-
Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
66

77
This program is free software; you can redistribute it and/or modify
88
it under the terms of the GNU General Public License as published by
@@ -76,13 +76,17 @@
7676
</InstallUISequence>
7777

7878
<!-- Find previous installation -->
79-
<Property Id="INSTALLDIR">
79+
<Property Id="GETINSTALLDIR">
8080
<RegistrySearch Id="FindInstallLocation"
8181
Root="HKLM"
8282
Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
8383
Name="InstallLocation"
8484
Type="raw" />
8585
</Property>
86+
<CustomAction Id="SetInstall" Property="INSTALLDIR" Value="[GETINSTALLDIR]" />
87+
<InstallUISequence>
88+
<Custom Action="SetInstall" After="AppSearch">Installed</Custom>
89+
</InstallUISequence>
8690
<?if @Platform@ != "x64" ?>
8791
<Property Id="OLDERVERSION">
8892
<RegistrySearch Id="FindOlderVersion"

0 commit comments

Comments
 (0)