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

--===============0660752043==
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
      mysql-test/t/wait_timeout.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-01 13:55:49 +0000
+++ b/client/mysqltest.cc	2010-10-13 11:12:05 +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-13 11:07:28 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-13 11:12:05 +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;
     }
   }

=== modified file 'mysql-test/t/wait_timeout.test'
--- a/mysql-test/t/wait_timeout.test	2009-03-06 14:56:17 +0000
+++ b/mysql-test/t/wait_timeout.test	2010-10-13 11:10:55 +0000
@@ -53,7 +53,7 @@ while (!`select @aborted_clients`)
   dec $retries;
   if (!$retries)
   {
-    Failed to detect that client has been aborted;
+    die Failed to detect that client has been aborted;
   }
 }
 --enable_query_log
@@ -108,7 +108,7 @@ while (!`select @aborted_clients`)
   dec $retries;
   if (!$retries)
   {
-    Failed to detect that client has been aborted;
+    die Failed to detect that client has been aborted;
   }
 }
 --enable_query_log


--===============0660752043==
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: 037c5a4d5d3ef70b80132d9df7950071ea53aa3c
# timestamp: 2010-10-13 13:12:38 +0200
# source_branch: file:///home/bm136801/my/pidwait-55/
# base_revision_id: bjorn.munch@stripped\
#   6jkjct2yguztbomw
# 
# Begin bundle
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


--===============0660752043==--