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

--===============1338290831==
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

 2942 Bjorn Munch	2010-10-19
      Bug #56654 pb2 log is very hard to read
      Added some more info in a number of fail cases
      (re-commit for administrative reasons)

    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-19 12:01:14 +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;
     }
   }


--===============1338290831==
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: edcf72685c8181ceead769698d70880e8a3eec2d
# timestamp: 2010-10-19 14:01:44 +0200
# base_revision_id: bjorn.munch@stripped\
#   91mkos3bq472ojrw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfZC0KsAAhffgFGwXef//36n
nQS////6UAUam1l63Zs5t06sOCwlEJoE0ZJ6MRqT8lPak9EbUaaGjTGo2keo9QAyQRPTASJjRGJq
fqmamjIGgDQABpoJQQQmmmgU/JT00aCbTSaGj1AyA000DTQcNNMjEYTTAQwCaYRgmJkNMjQ0AlFN
NEzUYJMjJ6hphB6mQwgNNAADRITEk5qCijWmXMrGrxax5wM69kgv0Nf3YD3q8PtgQTG5b1uc+FVa
511IgMpUUowZ9vDJd4P4H7yci30qbq1QVUj2BqpjQLe0Tbta+TrJXgyOslvH7Kbt3D1GJ14fzoGF
H7u0jVxuaWa+Hdp31jbXheNtd0MHbAblg0KHwwFCrrpFojNJfhQjYMiKR1/GvnzY362S8sLp0cOd
mJmq5waqkAip1qN2sTYsK56kZ0TasxW0yLlHdII08fnYWiEsDN+oGq46hisUfvt4dIrnL/yvp5q0
VUkPBOi5U2behqJSoM6M2wUF595hB0CLCMwqBcTGWDMRWOFIBSPjjCT9+0SsKp1ODbMOWuKREPco
hXfoLPNEF5WxQMBV1k72RvBYfcF4PtGQWmusYZfDYQLrRB99p0z5SfAuW0kMhaVWEGIoUQkEhuPE
RWiY0nHqFCpOZzzAFOXtFIMSDWlppxiy1DRw2tE0bNNe4wwG1trzEwqkMwwq6tyRzwoQWsgWC1GO
JHvLjMX5bNGXFIVFwXjU7aJm501xMCHN+jkutNEUhkLs0iYn6czp4apyGGrDQ0sGkGOwK0C4OcN9
5wdYkkFBVHTmXilsxQXMyKVxLjyhcs+eEzV08lOKwSkppA4yqbMq7EWnecMy42XWPQkjldCOSE1h
XNxWRZLAoCU15D/bM3QbeHEuHXc6iydUfqr9KIN2zRKoqrvuJOEEPE4nEaEX5FOCmXxIGbomMJte
/vnR9k6HuPeN7KmDcZuEtgDaidArcOvYdQkr+iuiEoWJGA4Mz5OhFDBzzRoa4GZxkPAla20yCZnD
lElIjKBKWyOzY3AqHxXvd2hGayM5F2yliBX0Esc/rOs01I9lFevUgm+0bnZEKPIiHTlclFfaKHA4
3qW/sqwmovShIEVyXxWFfr2QZLdYyWR8psIqZ8My7OdRrVgAbR1+C+ipbnYo7Vp3opbwImS1YheL
LxTKt+zRS9FnNn79HKrvJhllUsRUNWhsPeyjRFTD7GPWTtnt5RfjIIx7EUPaollDkgIb15qwVSy2
5NXOI6CVOGks8xEPxG3VHnFjUqVclA0U4UJ6DSKCUhEbKR/TwmO/KAwlpJbmtFmc/fNYYjLWio9K
XnMF07fPPf5aaoawwOlJFYEcZjfXYbpjIuipEKEwXUu0hGmJ1SX7wTBM8GEgciCyK8g6ocmm3KHN
aGCBe68A1LbFoWYIFbso+Q5zaOE3ZEE8R+uskbVergaiovRX+A10lYSGlY3hLCm817rMiEi4D1i1
REHqzjO3MQxC9R6MKhUycH26gIdZZuJDkDx0IOljTsj2kiQElp6VGIB5i09RzTEhpukdGbeiFIHV
ScSaCyqaUUTqnzJr3EAzSknAqF5mSCIlLRc6cPoFeCG0thpR8hk54lka6gCptMKTcSJTagvpMpE3
kk0GFbx0WjDqLcqSSVDzmW4HbAtmAFpTilxFDbOtejkDjvtRCwLGIij4yqvwn4RN80SuglDQ3F0U
aeczJTcysMKqBVfJ8RDIj8wmALE40bK7DFLpRkiaPPEbGC3kcR3QJF9l7hEcGxDhKBUK0J2qWUjo
04i14qNhHwVOJ4vMwtDAZxKrIjVbORO0r/i7kinChIeyFoVY


--===============1338290831==--