1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fixed wrong filenames in maria unittest that caused unittest to fail

mysql-test/suite/sphinx/suite.pm:
  Update test to support 1.10-beta
storage/maria/unittest/ma_test_all-t:
  Fixed old filenames
This commit is contained in:
Michael Widenius
2011-03-01 13:37:29 +02:00
parent 64ceea7a56
commit 9f2194090c
2 changed files with 13 additions and 3 deletions

View File

@ -29,8 +29,18 @@ return "No SphinxSE" unless $ENV{HA_SPHINX_SO} or
{
local $_ = `"$exe_sphinx_searchd" --help`;
print "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';
print $ver;
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 ######################