mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 192.168.0.10:mysql/mysql-4.1-maint

Browse source 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
This commit is contained in:
unknown 2007-01-17 13:58:42 +01:00
commit f692b765f1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/lib/mtr_cases.pl
View file

@ -537,6 +537,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
{ {
@ -552,7 +554,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
@ -578,7 +580,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],
); );