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

--===============2141823846==
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
      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-13 11:10:04 +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;
     }
   }


--===============2141823846==
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: 1b7c2ef02df5231dbfd52d4508ea78af3191038f
# timestamp: 2010-10-13 13:10:25 +0200
# source_branch: file:///home/bm136801/my/morelog-51/
# base_revision_id: bjorn.munch@stripped\
#   veqf65w074cv1daj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTUJHTQAAhDfgFGwXef//36n
nQS////6UAT6m13aex4r2Z1e893VsJTUQEmynppT1PxTKPNUe0Sep4k8iGmhkPUekeoAygIyNMQT
QmnqYp6m0mnqGnqHqA0AA0AlCNE1GTTUzVPaaTSek0MQB6gNDQ9QAAJIlT9GqenqjTTTQ0MTQ0MQ
AAAAAAkkmVPTCTZRptQ9ENPU0aAABoAADRIS1JzUFFGzmjSrG3sbiE4l68Je4XXi2vKetWhwyoNP
+Fas0EUiT4IM2IYHYkIpud9++jN3xcT98+FW4keFaQVUfWG2j1C4M509LYSgslhFkgslwIcKavNy
9RbBeXAUUb6fI++TmgbGbD67ORY567IPnr1RyfOI3di0arYCkcj7CwQiiz7pEGilCUOt1K337reb
nj5YVSm4b17jJL3BiECEZNvQ/Y5tKjVVbOv24q3k6wEGsGefXurMgxJYNNFFWcblCx22jfM+ISuN
f4Vw6dc02kisE4vTJeUWEuQBiZktoYGxZriIINhhDGie0hRYi7/SgnJKT1XI4LYqnO8f3YGWM4A0
r6VCOjoJ1KiQTHYY6YhYaQVsqFLKroqBpHA9oTqfQGiWIdzW8JiGVae4236IaZlRsHrKlW8j3C5R
DYy2m8nU9DSS4lCq+XNmpBaRzcZEoIt65zc5KxnmuZsTkyiPXGSJJMdEom1xldgtNG+JDOKS2Mo5
VAhWZxQXqZlV+yF4o1Aa4skM87aEgdwTz2RlYDpDTgioW6g6tnLSw6c2WAlkrmzsMHhojoYDiHh1
MxscrTabwZym9M7C91YSJhr6UpmgqorW292OqwwospawQhgqxFi9s1yCF1DWDK5bXb1LIlmU2Khf
G8c5lEoCQIo16T/dNXabLOdTZeh6Fe3S6/R0sw/bNIkJLh6y94wx8jkch4SfoR4op+xC7wkc4mu4
fOhorKGOw9o/tqcPnHhm2ajQ12/SbObP2TMxQGqh4dQaW34RgRU6i2+sj1NVxKvAdChxm4OkMoDs
YgSGm4VwTSBwEAncZXf0lNaxmR7BgMNHnOsWWyvmaOebGw2TrGqhmgckSwJFlyNlRfkGC9Ae+1q/
TkTndK6YVKeCirqx/KnohsD3NeOQonHbajcUpUsAtPronGxcPQ/ah+bDJCVNAiZKxGCti7hlcqu7
HZchRzY4WyR1fRIquHWUEZJOlFXuTTjkxR9Tole7sHmpF77wzonMg3IazBA0JHatVYJF1h8WqvNx
sNxUNcXzKNttlqJXE6WukhFoYwZyknGcCvhKVKb6cKAt3CxQAyeUXyjsyppI4R+dvEQM+lJom8kR
oC2h+ejh0eWKoNBraVOC7aNDfeUNsGtES+7ZSMVarwBwSbKswhQFDgxGZKkNOzmOGam9HSPqgRLE
rptBLkeUFSM1Gv5x+it5l3bPxvRDjb1dCWlpnV/0LeZl0JEVA1xqE2yrH9RJkioNYpdE61o3s5EW
VZ1hx2B69uqnSVaF5Ik1RhY3Iq5+JEwnldDKYLAmG+ArEcz5HC3WhBQscnjqB2HOI1UlzqaqMkHi
FAXqWBkaJdVpJY4OJ94iRtFx9aipKccC3CeYAldW+Q3kiU2qMKHEOOsGFbGdoxBRQjJnHM1IMUro
DSLWzKy1iyNuWBr3qEi4DDxh1JNNlyvKyqGo9Ruj5DU6NPSaEpqZWGFVAyYShmLkbIFibkuaAxOC
O0MGfsrGpYo6XEf6skTbNwgN7EGAcKispEpE9Z6FStbq0borCSwU45RzkAZY3GGKOAWHNFdfMWpc
jf4u5IpwoSBqEjpo


--===============2141823846==--