mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge pilot.(none):/data/msvensson/mysql/bug26397/my41-bug26397
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
@ -3607,6 +3607,9 @@ sub do_before_start_master ($) {
|
|||||||
|
|
||||||
# FIXME what about second 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*") )
|
foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
|
||||||
{
|
{
|
||||||
unlink($bin);
|
unlink($bin);
|
||||||
@ -3638,6 +3641,9 @@ sub do_before_start_slave ($) {
|
|||||||
my $tname= $tinfo->{'name'};
|
my $tname= $tinfo->{'name'};
|
||||||
my $init_script= $tinfo->{'master_sh'};
|
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*") )
|
foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
|
||||||
{
|
{
|
||||||
unlink($bin);
|
unlink($bin);
|
||||||
|
Reference in New Issue
Block a user