Branch: Tag:

2014-09-29

2014-09-29 13:57:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Installer [win32]: Fixed remaining issues with MariaDB.

The registry search rules should now be able to find both
mysqladmin and myisamchk. They were not found earlier due to
the registry key "Location" having been renamed "INSTALLDIR"
in the MySQL to MariaDB transition.

1461:    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mariaisam55Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="Location" Type="raw"> +  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MyisamBin3" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mariaisam101Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="Location" Type="raw"> +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MyisamBin1" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mariaisam100Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="Location" Type="raw"> +  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MyisamBin2" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>
1529:    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mariadbadmin55Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="Location" Type="raw"> +  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MysqladminBin3" Path="bin">    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mariadbadmin101Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="Location" Type="raw"> +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MysqladminBin1" Path="bin">    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mariadbadmin100Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="Location" Type="raw"> +  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MysqladminBin2" Path="bin">    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>