diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-01 13:37:29 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-01 13:37:29 +0200 |
| commit | 9f2194090c7436ed0fea6220c4c4c8727dc41771 (patch) | |
| tree | efa374c93986b629fd4428835ebe869891d0421a /mysql-test | |
| parent | 64ceea7a56ba776a226577f7c5ab5b549638f54a (diff) | |
| download | mariadb-git-9f2194090c7436ed0fea6220c4c4c8727dc41771.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/sphinx/suite.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/suite/sphinx/suite.pm b/mysql-test/suite/sphinx/suite.pm index 199e59e26d7..0dd1da9fa5a 100644 --- a/mysql-test/suite/sphinx/suite.pm +++ b/mysql-test/suite/sphinx/suite.pm @@ -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 ###################### |