From: Bjorn Munch
Date: October 20 2010 10:21am
Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:2975 to 2976)
List-Archive: http://lists.mysql.com/commits/121286
Message-Id: <201010201021.o9KAL7vR012126@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2976 Bjorn Munch	2010-10-20 [merge]
      upmerge 52019

    modified:
      client/mysqltest.cc
 2975 Bjorn Munch	2010-10-19 [merge]
      upmerge 40406,55135,55968,56654

    modified:
      mysql-test/lib/mtr_misc.pl
      mysql-test/lib/mtr_process.pl
      mysql-test/mysql-test-run.pl
      mysql-test/t/mysqltest.test
      mysql-test/t/wait_timeout.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-01 13:56:59 +0000
+++ b/client/mysqltest.cc	2010-10-20 10:20:10 +0000
@@ -5783,7 +5783,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)
@@ -5795,16 +5795,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-1 > mb_start)
 	    my_ungetc(*--p);
 	}
       }
@@ -9873,6 +9873,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
@@ -9880,7 +9881,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);

No bundle (reason: useless for push emails).