1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Bjorn Munch 2009-08-18 09:40:20 +02:00
commit bc1b485f90
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/lib/mtr_cases.pm
View File

@ -858,14 +858,14 @@ sub collect_one_test_case {
if ( $tinfo->{'big_test'} and ! $::opt_big_test ) if ( $tinfo->{'big_test'} and ! $::opt_big_test )
{ {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need 'big-test' option"; $tinfo->{'comment'}= "Test needs 'big-test' option";
return $tinfo return $tinfo
} }
if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries ) if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
{ {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need debug binaries"; $tinfo->{'comment'}= "Test needs debug binaries";
return $tinfo return $tinfo
} }
@ -901,14 +901,14 @@ sub collect_one_test_case {
if ($tinfo->{'federated_test'}) if ($tinfo->{'federated_test'})
{ {
# This is a test that need federated, enable it # This is a test that needs federated, enable it
push(@{$tinfo->{'master_opt'}}, "--loose-federated"); push(@{$tinfo->{'master_opt'}}, "--loose-federated");
push(@{$tinfo->{'slave_opt'}}, "--loose-federated"); push(@{$tinfo->{'slave_opt'}}, "--loose-federated");
} }
if ( $tinfo->{'innodb_test'} ) if ( $tinfo->{'innodb_test'} )
{ {
# This is a test that need innodb # This is a test that needs innodb
if ( $::mysqld_variables{'innodb'} eq "OFF" || if ( $::mysqld_variables{'innodb'} eq "OFF" ||
! exists $::mysqld_variables{'innodb'} ) ! exists $::mysqld_variables{'innodb'} )
{ {
@ -929,7 +929,7 @@ sub collect_one_test_case {
if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) ) if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) )
{ {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need binlog"; $tinfo->{'comment'}= "Test needs binlog";
return $tinfo; return $tinfo;
} }
} }