diff options
| author | unknown <msvensson@pilot.(none)> | 2007-05-29 13:01:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-05-29 13:01:23 +0200 |
| commit | 4507f7ed4cd57979e363041206b08963fcb74096 (patch) | |
| tree | 111b3949bacff374235401344b18908908e69152 /mysql-test/mysql-test-run.pl | |
| parent | 116b14313d44b3e4bee8be2ec53311ad68be6b8d (diff) | |
| parent | 11c409518b09e68c8f9f7f45dfeaf34948ecfed8 (diff) | |
| download | mariadb-git-4507f7ed4cd57979e363041206b08963fcb74096.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/bug26397/my41-bug26397
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index efd05fa3061..01d12f9ff83 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3607,6 +3607,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); @@ -3638,6 +3641,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); |