mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +01:00
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:
commit
288a7fc0c9
1 changed files with 6 additions and 0 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue