database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

fix the sphinx test suite to work when sphinxse is statically linked into the server

Browse Source
This commit is contained in:
Sergei Golubchik
2010-09-21 17:29:18 +02:00
parent 54708d354d
commit 87d4af831a
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/sphinx/my.cnf
View File

@ -1,8 +1,5 @@
!include include/default_my.cnf
[mysqld.1]
plugin-load=@ENV.HA_SPHINX_SO
[source src1]
type = xmlpipe2
xmlpipe_command = cat suite/sphinx/testdata.xml

1
mysql-test/suite/sphinx/suite.opt Normal file
View File

@ -0,0 +1 @@
--plugin-load=$HA_SPHINX_SO

3
mysql-test/suite/sphinx/suite.pm
View File

@ -24,7 +24,8 @@ my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
my $exe_sphinx_searchd = &locate_sphinx_binary('searchd');
return "No Sphinx" unless $exe_sphinx_indexer and $exe_sphinx_searchd;
return "No SphinxSE" unless $ENV{HA_SPHINX_SO};
return "No SphinxSE" unless $ENV{HA_SPHINX_SO} or
$::mysqld_variables{'sphinx'} eq "ON";
{
local $_ = `"$exe_sphinx_searchd" --help`;