database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-10-25 12:41:34 +02:00
parent 0a7a2b8f66 379809f40e
commit 4a9f71aef4
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,9 +405,25 @@ sub main () {
} }
$use_innodb||= $test->{'innodb_test'}; $use_innodb||= $test->{'innodb_test'};
} }
$opt_skip_ndbcluster= $opt_skip_ndbcluster_slave= 1
unless $need_ndbcluster; # Check if cluster can be skipped
$opt_skip_im= 1 unless $need_im; if ( !$need_ndbcluster )
{
$opt_skip_ndbcluster= 1;
$opt_skip_ndbcluster_slave= 1;
}
# Check if slave cluster can be skipped
if ($max_slave_num == 0)
{
$opt_skip_ndbcluster_slave= 1;
}
# Check if im can be skipped
if ( ! $need_im )
{
$opt_skip_im= 1;
}
initialize_servers(); initialize_servers();