diff options
| author | unknown <msvensson@neptunus.(none)> | 2007-02-06 14:42:40 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2007-02-06 14:42:40 +0100 |
| commit | b93d81a8d10c7a0e03ca3f114ab1ad8066465293 (patch) | |
| tree | 93454fb169ecc159693ffd240fbabdf07b15ed62 /mysql-test/lib | |
| parent | 0dc19dadb9a75978addacf54f671901245105c14 (diff) | |
| parent | 1d2d9a033d5a5549ac968845a018a5d2e1ba3f9f (diff) | |
| download | mariadb-git-b93d81a8d10c7a0e03ca3f114ab1ad8066465293.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/my41-nmj
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -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], ); |