Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

sub mtr_get_pid_from_file ($);

sub mtr_get_opts_from_file ($);

sub mtr_fromfile ($);

sub mtr_tofile ($@);

sub mtr_tonewfile($@);

  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");

  my $text= join('', <FILE>);

  close FILE;

  $text =~ s/^\s+//;                    # Remove starting space, incl newlines

  $text =~ s/\s+$//;                    # Remove ending space, incl newlines

  return $text;

}

sub mtr_report_test_passed($);

sub mtr_report_test_failed($);

sub mtr_report_test_skipped($);

sub mtr_report_test_disabled($);

sub mtr_show_failed_diff ($);

sub mtr_report_stats ($);

  my $tinfo= shift;

  $tinfo->{'result'}= 'MTR_RES_SKIPPED';

  if ( $tinfo->{'disable'} )

  {

    print "[ disabled ]  $tinfo->{'comment'}\n";

  }

  else

  {

    print "[ skipped ]\n";

  }

}

sub mtr_report_test_passed ($) {

  my $tinfo= shift;

  $tinfo->{'result'}= 'MTR_RES_FAILED';

  print "[ fail ]\n";

  # FIXME Instead of this test, and meaningless error message in 'else'

  # we should write out into $::path_timefile when the error occurs.

  if ( -f $::path_timefile )

  {

    print "Errors are (from $::path_timefile) :\n";

    print mtr_fromfile($::path_timefile); # FIXME print_file() instead

    print "\n(the last lines may be the most important ones)\n";

  }

  else

  {

    print "Unexpected termination, probably when starting mysqld\n";

  }

}

sub mtr_report_stats ($) {

  my $tests= shift;