Commit ec12404f authored by unknown's avatar unknown

Always use two masters for ndb tests

Abandon attempt to only use one for some tests that don't use the second master


mysql-test/lib/mtr_cases.pl:
  Always use two masters for ndb tests
parent af218c9f
...@@ -551,6 +551,8 @@ sub collect_one_test_case($$$$$$$) { ...@@ -551,6 +551,8 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)"; $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
return; return;
} }
# Ndb tests run with two mysqld masters
$tinfo->{'master_num'}= 2;
} }
else else
{ {
...@@ -566,7 +568,7 @@ sub collect_one_test_case($$$$$$$) { ...@@ -566,7 +568,7 @@ sub collect_one_test_case($$$$$$$) {
if ( $tinfo->{'innodb_test'} ) if ( $tinfo->{'innodb_test'} )
{ {
# This is a test that need inndob # This is a test that need innodb
if ( $::mysqld_variables{'innodb'} eq "FALSE" ) if ( $::mysqld_variables{'innodb'} eq "FALSE" )
{ {
# innodb is not supported, skip it # innodb is not supported, skip it
...@@ -592,7 +594,6 @@ our @tags= ...@@ -592,7 +594,6 @@ our @tags=
["include/have_debug.inc", "need_debug", 1], ["include/have_debug.inc", "need_debug", 1],
["include/have_ndb.inc", "ndb_test", 1], ["include/have_ndb.inc", "ndb_test", 1],
["include/have_ndb_extra.inc", "ndb_extra", 1], ["include/have_ndb_extra.inc", "ndb_extra", 1],
["include/have_multi_ndb.inc", "master_num", 2],
["require_manager", "require_manager", 1], ["require_manager", "require_manager", 1],
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment