mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
This commit is contained in:
commit
21e3ff0e8a
1 changed files with 4 additions and 2 deletions
|
@ -806,7 +806,7 @@ sub find
|
|||
sub rm_all
|
||||
{
|
||||
my(@rm_files)=@_;
|
||||
my($dir,$current_dir,@files,@dirs);
|
||||
my($dir,$current_dir,@files,@dirs,$removed);
|
||||
$current_dir = `pwd`; chomp($current_dir);
|
||||
|
||||
foreach $dir (@rm_files)
|
||||
|
@ -830,7 +830,9 @@ sub rm_all
|
|||
}
|
||||
if ($#files >= 0)
|
||||
{
|
||||
system("rm -f " . join(" ",@files)) && abort("Can't remove files from $dir");
|
||||
$removed= unlink @files;
|
||||
print "rm_all : removed $removed files in $current_dir/$dir\n" if ($opt_debug);
|
||||
abort("Can't remove all $#files+1 from $current_dir/$dir, just $removed") if $removed != $#files+1;
|
||||
}
|
||||
foreach $dir (@dirs)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue