File tree Expand file tree Collapse file tree 1 file changed +3
-13
lines changed
storage/sphinx/mysql-test/sphinx Expand file tree Collapse file tree 1 file changed +3
-13
lines changed Original file line number Diff line number Diff line change @@ -18,24 +18,14 @@ sub locate_sphinx_binary {
18
18
19
19
# Look for Sphinx binaries
20
20
my $exe_sphinx_indexer = &locate_sphinx_binary(' indexer' );
21
+ return " 'indexer' binary not found" unless $exe_sphinx_indexer ;
21
22
22
- unless ($exe_sphinx_indexer ) {
23
- mtr_report(" Sphinx 'indexer' binary not found, sphinx suite will be skipped" );
24
- return " No Sphinx" ;
25
- }
26
23
my $exe_sphinx_searchd = &locate_sphinx_binary(' searchd' );
27
-
28
- unless ($exe_sphinx_searchd ) {
29
- mtr_report(" Sphinx 'searchd' binary not found, sphinx suite will be skipped" );
30
- return " No Sphinx" ;
31
- }
24
+ return " 'searchd' binary not found" unless $exe_sphinx_searchd ;
32
25
33
26
# Check for Sphinx engine
34
27
35
- unless ($ENV {HA_SPHINX_SO } or $: :mysqld_variables{' sphinx' } eq " ON" ) {
36
- mtr_report(" Sphinx engine not found, sphinx suite will be skipped" );
37
- return " No SphinxSE" ;
38
- }
28
+ return " SphinxSE not found" unless $ENV {HA_SPHINX_SO } or $: :mysqld_variables{' sphinx' } eq " ON" ;
39
29
40
30
{
41
31
local $_ = ` "$exe_sphinx_searchd " --help` ;
You can’t perform that action at this time.
0 commit comments