Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown 2007-05-29 13:02:20 +02:00
commit 288a7fc0c9

View file

@ -3658,6 +3658,9 @@ sub do_before_start_master ($) {
# FIXME what about second master.....
# Don't delete anything if starting dirty
return if ($opt_start_dirty);
foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
{
unlink($bin);
@ -3680,6 +3683,9 @@ sub do_before_start_slave ($) {
my $tname= $tinfo->{'name'};
my $init_script= $tinfo->{'master_sh'};
# Don't delete anything if starting dirty
return if ($opt_start_dirty);
foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
{
unlink($bin);