|
|
|
@ -537,6 +537,8 @@ sub collect_one_test_case($$$$$$$) { |
|
|
|
$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)"; |
|
|
|
return; |
|
|
|
} |
|
|
|
# Ndb tests run with two mysqld masters |
|
|
|
$tinfo->{'master_num'}= 2; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
@ -552,7 +554,7 @@ sub collect_one_test_case($$$$$$$) { |
|
|
|
|
|
|
|
if ( $tinfo->{'innodb_test'} ) |
|
|
|
{ |
|
|
|
# This is a test that need inndob |
|
|
|
# This is a test that need innodb |
|
|
|
if ( $::mysqld_variables{'innodb'} eq "FALSE" ) |
|
|
|
{ |
|
|
|
# innodb is not supported, skip it |
|
|
|
@ -578,7 +580,6 @@ our @tags= |
|
|
|
["include/have_debug.inc", "need_debug", 1], |
|
|
|
["include/have_ndb.inc", "ndb_test", 1], |
|
|
|
["include/have_ndb_extra.inc", "ndb_extra", 1], |
|
|
|
["include/have_multi_ndb.inc", "master_num", 2], |
|
|
|
["require_manager", "require_manager", 1], |
|
|
|
); |
|
|
|
|
|
|
|
|