diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-21 17:29:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-21 17:29:18 +0200 |
| commit | 87d4af831aa037cc862ad285e3a051a97af1ec6f (patch) | |
| tree | 8e7750f31e3efdbaf3d96dccc1f3127128208956 /mysql-test/suite/sphinx | |
| parent | 54708d354de7767b3303f7a41ae1a95fc8845765 (diff) | |
| download | mariadb-git-87d4af831aa037cc862ad285e3a051a97af1ec6f.tar.gz | |
fix the sphinx test suite to work when sphinxse is statically linked into the server
Diffstat (limited to 'mysql-test/suite/sphinx')
| -rw-r--r-- | mysql-test/suite/sphinx/my.cnf | 3 | ||||
| -rw-r--r-- | mysql-test/suite/sphinx/suite.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/sphinx/suite.pm | 3 |
3 files changed, 3 insertions, 4 deletions
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`; |