mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Bug#39008 perl warning in mtr: 'use of uninitialized value in concatenation' in mtr:3995
This commit is contained in:
@ -4015,31 +4015,16 @@ 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
|
||||||
for my $path ( "$opt_vardir", "$opt_vardir/..") {
|
for my $path ( "$opt_vardir", "$opt_vardir/..") {
|
||||||
my $install_db= "$path/install.db";
|
my $install_db= "$path/install.db";
|
||||||
|
Reference in New Issue
Block a user