Branch: Tag:

2009-02-16

2009-02-16 14:43:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

More MySQL-related fixes...

Rev: server/etc/RoxenUI.wxs:1.64

1195:    <!-- NB: This rule would do the right thing if the evaluation    order was specified... -->    <RegistrySearch Id="MysqlLocation" Root="HKLM" -  Key="SOFTWARE\MySQL AB\[MYSQLNAME]" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\[MYSQLNAME]" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin1" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch>    <!-- Instead we need to fall back to doing it be hand... -->    <RegistrySearch Id="Mysql51Location" Root="HKLM" -  Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin2" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mysql50Location" Root="HKLM" -  Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin3" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mysql41Location" Root="HKLM" -  Key="SOFTWARE\MySQL AB\MySQL Server 4.1" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\MySQL Server 4.1" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin4" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>
1230:    </Property>    <Property Id="MYISAMCHKEXE">    <RegistrySearch Id="MyisamLocation" Root="HKLM" -  Key="SOFTWARE\MySQL AB\[MYSQLNAME]" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\[MYSQLNAME]" Name="Location" Type="raw">    <DirectorySearch Id="MyisamBin1" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Myisam51Location" Root="HKLM" -  Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw">    <DirectorySearch Id="MyisamBin2" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Myisam50Location" Root="HKLM" -  Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw">    <DirectorySearch Id="MyisamBin3" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Myisam41Location" Root="HKLM" -  Key="SOFTWARE\MySQL AB\MySQL Server 4.1" Name="Location" Type="directory"> +  Key="SOFTWARE\MySQL AB\MySQL Server 4.1" Name="Location" Type="raw">    <DirectorySearch Id="MyisamBin4" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>