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

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

BitKeeper/etc/logging_ok

@@ -128,6 +128,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

@@ -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_report.pl

@@ -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,7 +73,14 @@ sub mtr_report_test_skipped ($) {
   my $tinfo= shift;
 
   $tinfo->{'result'}= 'MTR_RES_SKIPPED';
-  print "[ skipped ]\n";
+  if ( $tinfo->{'disable'} )
+  {
+    print "[ disabled ]  $tinfo->{'comment'}\n";
+  }
+  else
+  {
+    print "[ skipped ]\n";
+  }
 }
 
 sub mtr_report_test_passed ($) {
@@ -95,9 +103,18 @@ sub mtr_report_test_failed ($) {
   $tinfo->{'result'}= 'MTR_RES_FAILED';
   print "[ fail ]\n";
 
-  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";
+  # 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 ($) {