fix uninitialized warning in mysql-test-run.pl

make the test to require sphinx 2.0.4 or later

1 files changed, 2 insertions, 13 deletions

diff --git a/mysql-test/suite/sphinx/suite.pm b/mysql-test/suite/sphinx/suite.pm
index fd93f0755fa..f9787d80aa3 100644
--- a/mysql-test/suite/sphinx/suite.pm
+++ b/mysql-test/suite/sphinx/suite.pm
@@ -6,9 +6,6 @@ use mtr_report;
 
 @ISA = qw(My::Suite);
 
-use Carp;
-$Carp::Verbose=1;
-
 ############# initialization ######################
 sub locate_sphinx_binary {
   my ($name)= @_;
@@ -30,16 +27,8 @@ 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]+)/);
-  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 (found $ver) " unless $ver ge '0001.0010';
-  }
-  else
-  {
-    return "Sphinx 0.9.9 or later is needed (found $ver) " unless $ver ge '0000.0009.0009';
-  }
+  my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/);
+  return "Sphinx 2.0.4 or later is needed (found $ver) " unless $ver ge '0002.0000.0004';
 }
 
 ############# action methods ######################