1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge bk-internal:/home/bk/mysql-5.1-new

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@shellback.(none)
2006-05-18 20:21:43 +02:00
19 changed files with 153 additions and 91 deletions

View File

@ -876,6 +876,7 @@ sub command_line_setup () {
start_timeout => 400, # enough time create innodb tables
ndbcluster => 1, # ndbcluster not started
master_opt => [],
};
$master->[1]=
@ -2143,6 +2144,14 @@ sub run_testcase ($) {
{
$do_restart= 1;
}
# Check that running master was started with same options
# as the current test requires
elsif (! mtr_same_opts($master->[0]->{'master_opt'},
$tinfo->{'master_opt'}) )
{
$do_restart= 1;
}
if ( $do_restart )
{
@ -2222,6 +2231,8 @@ sub run_testcase ($) {
report_failure_and_restart($tinfo);
return;
}
# Remember options used to start
$master->[0]->{'master_opt'}= $tinfo->{'master_opt'};
}
if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
{