database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2017-01-10 14:39:28 +02:00
parent 3d46768da2 5044dae239
commit f27ca6f667
14 changed files with 178 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
storage/sphinx/mysql-test/sphinx/suite.pm
View File

@@ -16,13 +16,26 @@ sub locate_sphinx_binary {
for (@list) { return $_ if -x $_; }
}
# Look for Sphinx binaries.
# Look for Sphinx binaries
my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
unless ($exe_sphinx_indexer) {
mtr_report("Sphinx 'indexer' binary not found, sphinx suite will be skipped");
return "No 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} or
$::mysqld_variables{'sphinx'} eq "ON";
unless ($exe_sphinx_searchd) {
mtr_report("Sphinx 'searchd' binary not found, sphinx suite will be skipped");
return "No Sphinx";
}
# Check for Sphinx engine
unless ($ENV{HA_SPHINX_SO} or $::mysqld_variables{'sphinx'} eq "ON") {
mtr_report("Sphinx engine not found, sphinx suite will be skipped");
return "No SphinxSE";
}
{
local $_ = `"$exe_sphinx_searchd" --help`;