From 87d4af831aa037cc862ad285e3a051a97af1ec6f Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 21 Sep 2010 17:29:18 +0200
Subject: [PATCH] fix the sphinx test suite to work when sphinxse is statically
 linked into the server

---
 mysql-test/suite/sphinx/my.cnf    | 3 ---
 mysql-test/suite/sphinx/suite.opt | 1 +
 mysql-test/suite/sphinx/suite.pm  | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 mysql-test/suite/sphinx/suite.opt

diff --git a/mysql-test/suite/sphinx/my.cnf b/mysql-test/suite/sphinx/my.cnf
index 78e5cad6894..ba5dd7578e8 100644
--- a/mysql-test/suite/sphinx/my.cnf
+++ b/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
diff --git a/mysql-test/suite/sphinx/suite.opt b/mysql-test/suite/sphinx/suite.opt
new file mode 100644
index 00000000000..b8964ecd9e9
--- /dev/null
+++ b/mysql-test/suite/sphinx/suite.opt
@@ -0,0 +1 @@
+--plugin-load=$HA_SPHINX_SO
diff --git a/mysql-test/suite/sphinx/suite.pm b/mysql-test/suite/sphinx/suite.pm
index ee5c3941b63..199e59e26d7 100644
--- a/mysql-test/suite/sphinx/suite.pm
+++ b/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`;