diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-17 13:58:42 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-17 13:58:42 +0100 |
| commit | f692b765f1ee2c8c5c45f5f4fe180645b1a454cf (patch) | |
| tree | 3556afded8f30efd28cc9fa0088a0092e931ffb2 /mysql-test | |
| parent | b95f107371606a6771e28447750372e172513d95 (diff) | |
| parent | 80818def47aac3ee693477f3782a02c1adab01a9 (diff) | |
| download | mariadb-git-f692b765f1ee2c8c5c45f5f4fe180645b1a454cf.tar.gz | |
Merge 192.168.0.10:mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index a00d06d2e60..8c2dbdec804 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -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], ); |