[Commits] Rev 2868: fix the sphinx test suite to work when sphinxse is statically linked into the server in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Tue Sep 21 18:29:24 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2868
revision-id: sergii at pisem.net-20100921152918-mu8hnxmb09om9lks
parent: sergii at pisem.net-20100921142403-pwhiz9lj3xdd9ihm
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Tue 2010-09-21 17:29:18 +0200
message:
  fix the sphinx test suite to work when sphinxse is statically linked into the server
-------------- next part --------------
=== modified file 'mysql-test/suite/sphinx/my.cnf'
--- a/mysql-test/suite/sphinx/my.cnf	2010-09-12 12:33:04 +0000
+++ b/mysql-test/suite/sphinx/my.cnf	2010-09-21 15:29:18 +0000
@@ -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

=== added file 'mysql-test/suite/sphinx/suite.opt'
--- a/mysql-test/suite/sphinx/suite.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sphinx/suite.opt	2010-09-21 15:29:18 +0000
@@ -0,0 +1 @@
+--plugin-load=$HA_SPHINX_SO

=== modified file 'mysql-test/suite/sphinx/suite.pm'
--- a/mysql-test/suite/sphinx/suite.pm	2010-09-12 12:33:04 +0000
+++ b/mysql-test/suite/sphinx/suite.pm	2010-09-21 15:29:18 +0000
@@ -24,7 +24,8 @@ my $exe_sphinx_indexer = &locate_sphinx_
 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`;



More information about the commits mailing list