Branch: Tag:

2016-06-03

2016-06-03 12:48:04 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Installer [Win32]: Prefer MariaDB 10.1 to MariaDB 10.0.

Potential fix for [bug 7705 (#7705)] (and possibly [bug 7698 (#7698)]).

1391:    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch> -  <RegistrySearch Id="MariaDB101Location" Root="HKLM" -  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw"> -  <DirectorySearch Id="MysqldBin1" Path="bin"> -  <FileSearch LongName="mysqld.exe" /> -  </DirectorySearch> -  </RegistrySearch> +     <RegistrySearch Id="MariaDB100Location" Root="HKLM"    Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="INSTALLDIR" Type="raw">    <DirectorySearch Id="MysqldBin2" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch> -  +  <RegistrySearch Id="MariaDB101Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw"> +  <DirectorySearch Id="MysqldBin1" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch>    </Property>    <Property Id="FALLBACKMYSQLDEXE">    <!-- NOTE: Reverse order of priority. Last matching entry wins. -->
1466:    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch> -  <RegistrySearch Id="Mariaisam101Location" Root="HKLM" -  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="INSTALLDIR" Type="raw">    <DirectorySearch Id="MyisamBin2" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch> -  +  <RegistrySearch Id="Mariaisam101Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw"> +  <DirectorySearch Id="MyisamBin1" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch>    </Property>    <Property Id="FALLBACKMYISAMCHKEXE">    <!-- NOTE: Reverse order of priority. Last matching entry wins. -->
1534:    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>    </RegistrySearch> -  <RegistrySearch Id="Mariadbadmin101Location" Root="HKLM" -  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="INSTALLDIR" Type="raw">    <DirectorySearch Id="MysqladminBin2" Path="bin">    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>    </RegistrySearch> -  +  <RegistrySearch Id="Mariadbadmin101Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw"> +  <DirectorySearch Id="MysqladminBin1" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch>    </Property>    <Property Id="FALLBACKMYSQLADMINEXE">    <!-- NOTE: Reverse order of priority. Last matching entry wins. -->