diff options
| author | unknown <msvensson@shellback.(none)> | 2006-03-08 17:00:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-03-08 17:00:56 +0100 |
| commit | bfa21dd1520b2f718a1f1aa8c6256f62c91cfff8 (patch) | |
| tree | bad6af193cd0078a32ea51665b43dfef4c48d500 | |
| parent | 9c6abf3f5cd43409ffdf791ff4abe835b0383d81 (diff) | |
| parent | acb53e4ec4509d326250ee8e97d3c1404832e64b (diff) | |
| download | mariadb-git-bfa21dd1520b2f718a1f1aa8c6256f62c91cfff8.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysqltestrun_ndbclusterstart/my50-mysqltestrun_ndbclusterstart
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 7 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index fc32c56536f..51eed62c1ff 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -258,6 +258,13 @@ sub collect_one_test_case($$$$$$$) { $tinfo->{'ndb_test'}= 1; if ( $::opt_skip_ndbcluster ) { + # Skip all ndb tests + $tinfo->{'skip'}= 1; + return; + } + if ( ! $::opt_with_ndbcluster ) + { + # Ndb is not supported, skip them $tinfo->{'skip'}= 1; return; } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c105ace789f..75491795a60 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1840,7 +1840,7 @@ sub run_testcase ($) { if ( $tinfo->{'master_restart'} or $master->[0]->{'running_master_is_special'} or # Stop if cluster is started but test cases does not need cluster - ( $tinfo->{'ndb_test'} != $using_ndbcluster_master ) ) + ( $opt_with_ndbcluster && $tinfo->{'ndb_test'} != $using_ndbcluster_master ) ) { stop_masters(); $master->[0]->{'running_master_is_special'}= 0; # Forget why we stopped @@ -1889,7 +1889,7 @@ sub run_testcase ($) { if ( $tinfo->{'component_id'} eq 'mysqld' and ! $opt_local_master ) { - if ( $master->[0]->{'ndbcluster'} ) + if ( $opt_with_ndbcluster and $master->[0]->{'ndbcluster'} ) { # Cluster is not started |