Commit 12e4d1c8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 


Build-tools/Do-compile:
  Auto merged
parents 58de6bb9 12df0887

Build-tools/Do-compile

+4 −2
Original line number Diff line number Diff line
@@ -811,7 +811,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)
@@ -835,7 +835,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)

      {