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

fix uninitialized warning in mysql-test-run.pl

Browse Source 
make the test to require sphinx 2.0.4 or later
This commit is contained in:
Sergei Golubchik
2012-03-09 09:20:45 +01:00
parent 4933d21e5d
commit 96a21ab324
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -418,6 +418,8 @@ sub main {
mtr_report("Checking supported features..."); mtr_report("Checking supported features...");
executable_setup();
# --debug[-common] implies we run debug server # --debug[-common] implies we run debug server
$opt_debug_server= 1 if $opt_debug || $opt_debug_common; $opt_debug_server= 1 if $opt_debug || $opt_debug_common;
@ -436,8 +438,6 @@ sub main {
check_ssl_support(); check_ssl_support();
check_debug_support(); check_debug_support();
executable_setup();
mtr_report("Collecting tests..."); mtr_report("Collecting tests...");
my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list); my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list);
mark_time_used('collect'); mark_time_used('collect');

15
mysql-test/suite/sphinx/suite.pm
View File

@ -6,9 +6,6 @@ use mtr_report;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);
use Carp;
$Carp::Verbose=1;
############# initialization ###################### ############# initialization ######################
sub locate_sphinx_binary { sub locate_sphinx_binary {
my ($name)= @_; my ($name)= @_;
@ -30,16 +27,8 @@ return "No SphinxSE" unless $ENV{HA_SPHINX_SO} or
{ {
local $_ = `"$exe_sphinx_searchd" --help`; local $_ = `"$exe_sphinx_searchd" --help`;
mtr_verbose("tool: $exe_sphinx_searchd\n$_"); mtr_verbose("tool: $exe_sphinx_searchd\n$_");
my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)\.([0-9]+)/); my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/);
if ($ver eq "0000.0000.0000") return "Sphinx 2.0.4 or later is needed (found $ver) " unless $ver ge '0002.0000.0004';
{
$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';
}
} }
############# action methods ###################### ############# action methods ######################