From: Bjorn Munch
Date: October 12 2010 12:41pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2940) Bug#56654
List-Archive: http://lists.mysql.com/commits/120546
X-Bug: 56654
Message-Id: <201010121241.o9CCfHL7023477@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0401136801=="

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

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

 2940 Bjorn Munch	2010-10-12
      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;
     }
   }


--===============0401136801==
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/morelog-51/
# testament_sha1: ceee8bee2150ec5304b842074686efd750901678
# timestamp: 2010-10-12 14:41:17 +0200
# base_revision_id: bjorn.munch@stripped\
#   i7m31uqahrrvfvf9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR56bv4AAgPfgFGwXef//36n
nQS////6UAUamzu4dbPLIPUd1e3CSRGinoxqDU2p6mAmgT1MmmTT1BpoaGmQAlEIaaMmmoEwmoPQ
nqGgMI0ZAAaaAlBBAEGqeaTUep+qeUaGgAHqANqAACSSNT0GpNNqYQNGhk0aMgAGgAAAlKYQ0AkP
UPSAG1PTU0GaQAAAD1EhL0nNQUUbMacFY62rIecDqL0y/QuzmbZWcVZ+VaCq8W1NpkhOzPkk02CB
1jDGHjd+O+Onvh+T914m1WMfO1kFVI8g3UxoFxaJ0dDYydZK8GR1kuI/KnX59/sL3XfiKKN9fmfi
rg5tZsftt3LDNZa8c1muFX0gNzwaFF7ikKoSSojgsvywjWPVi202N8WXipr34euN08bTe7jSbIWl
SqSiZdjD+ly5mmbJanX9VlrypsBJ0Annh8bTKIppvqp1or9pskI0a5+bpI41e8n9HJWNkSKBLJvO
qkzUypTsGPEJzODAnDgbHdkUghhYYJyThywiyaZIPaRibo0pI4fedlxKuidF1wWxg4NdhS6QRQDi
obOY0+dWOEgXCcr3NpjfWlnWN2QsLTDKV63Jjy6M5K+25uTRHJYbSBRlc0kOVdBXMTNxk1ENVBLn
MODWXRciRueKNzKD7fBN7Ve6eA7OqM3JwZDvOJLXJYtmbYCVSdUJYlKqF7kZRmwW1BeEykMC8qKu
04TMYPNPdK0ymgH8PvlsWuZwV/o0Zt/KcE9BKYsUt6HbdRHANbietTajMaM5MfOmk1bpbciUpCqm
KQFmQTErzPYyQNizVnusbEvW2dzkqwYqa95K8jWleiBXT24IUxwlYsZxcVkWDSE4QmbYf7mw7j0Y
62pz2PYajq3uTZzpD+imdmGZvDiKPGWbzPM8x4T+Qx4sYfqSu753OKezw7oqHBFHYewfuyOFzGJg
WpZmsSHO5EJAfjWGdMgZZihCJ0F08iF767hdaUrM1KnDpxkhoD85jIYo9YMYseV7tVzCXji1643C
yyIN1faYj3l1CphZ7avdnQtGvHM9yRRyJF5xLIvEUN7jeZcO0+7DK1S9FmkXgmROGbwdL28CqmNR
tJ57+GhedGaAJI9di1vp9M8lo1atys8gsS195rfKGcy0vZNvxxM9YbL0c7avs4w32NqZGi597udh
unsm6nQajlwZcw26gToOTB62FdgkUpNpay0OBzgy5zAqF48BrymziKTbr3sorSh5ys1K58ZAYqRH
AdQwLMFBar3m4U69FcQJCPwWYi7+pqpIeFXGXym1MoLHA5A1Rfsj9uHfhkDhPSt5nBskvOIizm0n
9m1I4rldlC+Llo2rXpCUIuDAVqEhos5jLTrXIWSd7yUiqZ5BXkjdW0J1SlmkZQuYdb1kvPXNBivj
PLrSM7u2KrKyLO/oXRqgkSp5gGrJsSs/1aZkigMpByI02zgtIeypcsO/ZHWNKiGoFMl9ImagxsZH
q9+JEQjXbqcogttPVquRLk9hW6r7MmlPScvq6V6IKaaFEL0FskoVPWqyLhUp0lie4l4RS0N8kbUi
8BgsaStkiAIlVMcXEqQEEKsgkRq1mkkaEm0GFbZToGHUUITaMTPU7FV9ILISlMoNsdX1vcG8G7VQ
iFAPDB4VgI4772FJU3aYkCmZTSajTwNKU62VhhVQKsZPcZ0aoLU7CZ2cYm6U7ImPjvNrh4j+RiH+
vRDGvxpSBI3Cb7MC4iilMEYlETvuJ5ROVCrDMQslFJBENB5LVAbi8TQrHL0WYSwR0fW3+LuSKcKE
gPPTd/A=


--===============0401136801==--