Commit f8d38cff authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 

into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents 81abb11a 044f9e82

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ miguel@light. 
miguel@light.local

miguel@sartre.local

mikael@mc04.(none)

mikael@orca.ndb.mysql.com

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com

mysql-test/lib/mtr_io.pl

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use strict; 


sub mtr_get_pid_from_file ($);

sub mtr_get_opts_from_file ($);

sub mtr_fromfile ($);

sub mtr_tofile ($@);

sub mtr_tonewfile($@);
@@ -107,6 +108,8 @@ sub mtr_fromfile ($) { 
  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;

}

mysql-test/lib/mtr_process.pl

+465 −207

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/lib/mtr_report.pl

+21 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ sub mtr_report_test_name($); 
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 ($);
@@ -72,8 +73,15 @@ sub mtr_report_test_skipped ($) { 
  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;
@@ -95,10 +103,19 @@ sub mtr_report_test_failed ($) { 
  $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;

mysql-test/mysql-test-run.pl

+178 −279

File changed.

Preview size limit exceeded, changes collapsed.