From: Bjorn Munch
Date: October 13 2010 8:04am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3100)
List-Archive: http://lists.mysql.com/commits/120631
Message-Id: <201010130804.o9D84YTn023841@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0209161575=="

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

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

 3100 Bjorn Munch	2010-10-13 [merge]
      upmerge 52019,56654

    modified:
      client/mysqltest.cc
      mysql-test/mysql-test-run.pl
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-01 13:55:49 +0000
+++ b/client/mysqltest.cc	2010-10-13 08:03:33 +0000
@@ -5779,7 +5779,7 @@ int read_line(char *buf, int size)
       /* Could be a multibyte character */
       /* This code is based on the code in "sql_load.cc" */
 #ifdef USE_MB
-      int charlen = my_mbcharlen(charset_info, c);
+      int charlen = my_mbcharlen(charset_info, (unsigned char) c);
       /* We give up if multibyte character is started but not */
       /* completed before we pass buf_end */
       if ((charlen > 1) && (p + charlen) <= buf_end)
@@ -5791,16 +5791,16 @@ int read_line(char *buf, int size)
 
 	for (i= 1; i < charlen; i++)
 	{
+	  c= my_getc(cur_file->file);
 	  if (feof(cur_file->file))
 	    goto found_eof;
-	  c= my_getc(cur_file->file);
 	  *p++ = c;
 	}
 	if (! my_ismbchar(charset_info, mb_start, p))
 	{
 	  /* It was not a multiline char, push back the characters */
 	  /* We leave first 'c', i.e. pretend it was a normal char */
-	  while (p > mb_start)
+	  while (p > mb_start+1)
 	    my_ungetc(*--p);
 	}
       }
@@ -9864,6 +9864,7 @@ void free_pointer_array(POINTER_ARRAY *p
 void replace_dynstr_append_mem(DYNAMIC_STRING *ds,
                                const char *val, int len)
 {
+  char lower[512];
 #ifdef __WIN__
   fix_win_paths(val, len);
 #endif
@@ -9871,7 +9872,6 @@ void replace_dynstr_append_mem(DYNAMIC_S
   if (display_result_lower) 
   {
     /* Convert to lower case, and do this first */
-    char lower[512];
     char *c= lower;
     for (const char *v= val;  *v;  v++)
       *c++= my_tolower(charset_info, *v);

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-10-07 11:32:32 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-13 08:03:33 +0000
@@ -609,13 +609,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');
@@ -3184,7 +3186,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;
@@ -3226,6 +3229,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;
   }
 
@@ -3859,7 +3866,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;
     }
   }


--===============0209161575==
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/pidwait-55/
# testament_sha1: 4f678156e0e1030d8aca3f58160f72cf6beb3b62
# timestamp: 2010-10-13 10:04:34 +0200
# source_branch: file:///home/bm136801/my/pidwait-55/
# base_revision_id: bjorn.munch@stripped\
#   4ua1cxf0zgxhfp9s
# 
# Begin bundle
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


--===============0209161575==--