Commit a4c1ce7f authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents 01532e3f d4aadb06

mysql-test/lib/mtr_report.pl

+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ sub mtr_verbose (@); 
# We can't use diff -u or diff -a as these are not portable



sub mtr_show_failed_diff ($) {

  my $tname=  shift;

  my $result_file_name=  shift;



  # The reject and log files have been dumped to

  # to filenames based on the result_file's name

  my $tname= basename($result_file_name);

  $tname=~ s/\..*$//;



  my $reject_file=  "r/$tname.reject";

  my $result_file=  "r/$tname.result";

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -3264,7 +3264,7 @@ sub report_failure_and_restart ($) { 
  my $tinfo= shift;



  mtr_report_test_failed($tinfo);

  mtr_show_failed_diff($tinfo->{'name'});

  mtr_show_failed_diff($tinfo->{'result_file'});

  print "\n";

  if ( $opt_force )

  {