Bug#39008 perl warning in mtr: 'use of uninitialized value in concatenation' in mtr:3995
mysql-test/mysql-test-run.pl: Don't bother to remove particular files from the datadir, based on what config parameters are available. Just remove whole datadir
This commit is contained in:
parent
455189602f
commit
79a6981f30
@ -4015,29 +4015,14 @@ sub start_servers($) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $datadir= $mysqld->value('datadir');
|
my $datadir= $mysqld->value('datadir');
|
||||||
|
|
||||||
# Don't delete anything if starting dirty
|
|
||||||
if (!$opt_start_dirty)
|
if (!$opt_start_dirty)
|
||||||
{
|
{
|
||||||
my @options= ('log-bin', 'relay-log');
|
# Don't delete anything if starting dirty
|
||||||
|
|
||||||
foreach my $option_name ( @options ) {
|
if (-d $datadir ) {
|
||||||
next unless $mysqld->option($option_name);
|
mtr_verbose(" - removing '$datadir'");
|
||||||
|
rmtree($datadir);
|
||||||
my $value= $mysqld->value($option_name);
|
|
||||||
|
|
||||||
foreach my $file ( glob("$datadir/$value*") )
|
|
||||||
{
|
|
||||||
#print "removing: $file\n";
|
|
||||||
mtr_debug("Removing '$file'");
|
|
||||||
unlink($file);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Remove old master.info and relay-log.info files
|
|
||||||
# from the servers datadir
|
|
||||||
unlink("$datadir/master.info");
|
|
||||||
unlink("$datadir/relay-log.info");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Copy datadir from installed system db
|
# Copy datadir from installed system db
|
||||||
|
Loading…
x
Reference in New Issue
Block a user