Browse Source

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

pull/843/head
Sergei Golubchik 15 years ago
parent
commit
87d4af831a
  1. 3
      mysql-test/suite/sphinx/my.cnf
  2. 1
      mysql-test/suite/sphinx/suite.opt
  3. 3
      mysql-test/suite/sphinx/suite.pm

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

@ -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

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

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

@ -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`;

Loading…
Cancel
Save