database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

BUG#17574 Detect cluster start failure and "fail" ndb_* tests

Browse Source 
- Fix problems that occur when ndbcluster is not supported
This commit is contained in:
msvensson@shellback.(none)
2006-03-08 16:57:42 +01:00
parent 51ef90a329
commit e37f80a1ac
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/lib/mtr_cases.pl
View File

@@ -258,6 +258,13 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'ndb_test'}= 1; $tinfo->{'ndb_test'}= 1;
if ( $::opt_skip_ndbcluster ) 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; $tinfo->{'skip'}= 1;
return; return;
} }

4
mysql-test/mysql-test-run.pl
View File

@@ -1840,7 +1840,7 @@ sub run_testcase ($) {
if ( $tinfo->{'master_restart'} or if ( $tinfo->{'master_restart'} or
$master->[0]->{'running_master_is_special'} or $master->[0]->{'running_master_is_special'} or
# Stop if cluster is started but test cases does not need cluster # 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(); stop_masters();
$master->[0]->{'running_master_is_special'}= 0; # Forget why we stopped $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 ( $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 # Cluster is not started