Commit f611c2cd authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
parents f186d913 392c00d4
......@@ -405,9 +405,25 @@ sub main () {
}
$use_innodb||= $test->{'innodb_test'};
}
$opt_skip_ndbcluster= $opt_skip_ndbcluster_slave= 1
unless $need_ndbcluster;
$opt_skip_im= 1 unless $need_im;
# Check if cluster can be skipped
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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment