From: Bjorn Munch
Date: October 13 2010 7:51am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2941) Bug#56654
List-Archive: http://lists.mysql.com/commits/120627
X-Bug: 56654
Message-Id: <201010130751.o9D7plNs023786@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0709617918=="

--===============0709617918==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/lowcase-51/ based on revid:bjorn.munch@stripped

 2941 Bjorn Munch	2010-10-13 [merge]
      Bug #56654 pb2 log is very hard to read
      Added some more info in a number of fail cases

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-30 10:42:37 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-12 12:40:20 +0000
@@ -586,13 +586,15 @@ sub run_test_server ($$$) {
 	  if ($test_has_failed and $retries <= $opt_retry){
 	    # Test should be run one more time unless it has failed
 	    # too many times already
+	    my $tname= $result->{name};
 	    my $failures= $result->{failures};
 	    if ($opt_retry > 1 and $failures >= $opt_retry_failure){
-	      mtr_report("\nTest has failed $failures times,",
+	      mtr_report("\nTest $tname has failed $failures times,",
 			 "no more retries!\n");
 	    }
 	    else {
-	      mtr_report("\nRetrying test, attempt($retries/$opt_retry)...\n");
+	      mtr_report("\nRetrying test $tname, ".
+			 "attempt($retries/$opt_retry)...\n");
 	      delete($result->{result});
 	      $result->{retries}= $retries+1;
 	      $result->write_test($sock, 'TESTCASE');
@@ -3094,7 +3096,8 @@ sub check_testcase($$)
 	    "\nMTR's internal check of the test case '$tname' failed.
 This means that the test case does not preserve the state that existed
 before the test case was executed.  Most likely the test case did not
-do a proper clean-up.
+do a proper clean-up. It could also be caused by the previous test run
+by this thread, if the server wasn't restarted.
 This is the diff of the states of the servers before and after the
 test case was executed:\n";
 	  $tinfo->{check}.= $report;
@@ -3136,6 +3139,10 @@ test case was executed:\n";
     # Kill any check processes still running
     map($_->kill(), values(%started));
 
+    mtr_warning("Check-testcase failed, this could also be caused by the" .
+		" previous test run by this worker thread")
+      if $result > 1 && $mode eq "before";
+
     return $result;
   }
 
@@ -3789,7 +3796,9 @@ sub get_log_from_proc ($$) {
   foreach my $mysqld (mysqlds()) {
     if ($mysqld->{proc} eq $proc) {
       my @srv_lines= extract_server_log($mysqld->value('#log-error'), $name);
-      $srv_log= "\nServer log from this test:\n" . join ("", @srv_lines);
+      $srv_log= "\nServer log from this test:\n" .
+	"----------SERVER LOG START-----------\n". join ("", @srv_lines) .
+	"----------SERVER LOG END-------------\n";
       last;
     }
   }


--===============0709617918==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/lowcase-51/
# testament_sha1: 67eafce63c3a50abeeef282614dcb866716c154b
# timestamp: 2010-10-13 09:51:47 +0200
# source_branch: file:///home/bm136801/my/morelog-51/
# base_revision_id: bjorn.munch@stripped\
#   veqf65w074cv1daj
# 
# Begin bundle
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


--===============0709617918==--