diff options
Diffstat (limited to 'mysql-test/suite/sphinx/suite.pm')
-rw-r--r-- | mysql-test/suite/sphinx/suite.pm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/suite/sphinx/suite.pm b/mysql-test/suite/sphinx/suite.pm index 199e59e26d7..e708b12faea 100644 --- a/mysql-test/suite/sphinx/suite.pm +++ b/mysql-test/suite/sphinx/suite.pm @@ -29,8 +29,17 @@ return "No SphinxSE" unless $ENV{HA_SPHINX_SO} or { local $_ = `"$exe_sphinx_searchd" --help`; + mtr_verbose("tool: $exe_sphinx_searchd\n$_"); my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)\.([0-9]+)/); - return "Sphinx 0.9.9 or later is needed" unless $ver ge '0000.0009.0009'; + if ($ver eq "0000.0000.0000") + { + $ver = sprintf "%04d.%04d", (/([0-9]+)\.([0-9]+)-(alpha|beta|gamma|RC)/); + return "Sphinx 0.9.9 or later is needed" unless $ver ge '0001.0010'; + } + else + { + return "Sphinx 0.9.9 or later is needed" unless $ver ge '0000.0009.0009'; + } } ############# action methods ###################### |