Commit f97220a0 authored by Sergei Golubchik's avatar Sergei Golubchik

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

parent 684556e1
!include include/default_my.cnf !include include/default_my.cnf
[mysqld.1]
plugin-load=@ENV.HA_SPHINX_SO
[source src1] [source src1]
type = xmlpipe2 type = xmlpipe2
xmlpipe_command = cat suite/sphinx/testdata.xml xmlpipe_command = cat suite/sphinx/testdata.xml
......
--plugin-load=$HA_SPHINX_SO
...@@ -24,7 +24,8 @@ my $exe_sphinx_indexer = &locate_sphinx_binary('indexer'); ...@@ -24,7 +24,8 @@ my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
my $exe_sphinx_searchd = &locate_sphinx_binary('searchd'); my $exe_sphinx_searchd = &locate_sphinx_binary('searchd');
return "No Sphinx" unless $exe_sphinx_indexer and $exe_sphinx_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`; local $_ = `"$exe_sphinx_searchd" --help`;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment