From: Bjorn Munch
Date: October 11 2010 7:57am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2940) Bug#52019
List-Archive: http://lists.mysql.com/commits/120472
X-Bug: 52019
Message-Id: <201010110757.o9B7vGig002779@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1412381999=="

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

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

 2940 Bjorn Munch	2010-10-11
      Bug #52019 main.mysqltest fails on new tests for lowercase_result
      Fixed as suggested above
      Confirmed on Linux PPC and on AIX 5.3

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-01 09:00:18 +0000
+++ b/client/mysqltest.cc	2010-10-11 07:55:08 +0000
@@ -5721,7 +5721,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)
@@ -5733,16 +5733,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);
 	}
       }
@@ -9781,6 +9781,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
@@ -9788,7 +9789,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);


--===============1412381999==
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/lowcase-51/
# testament_sha1: 5d9107529222ad2467b94cf731ded7bc18d3d42b
# timestamp: 2010-10-11 09:57:16 +0200
# base_revision_id: bjorn.munch@stripped\
#   i7m31uqahrrvfvf9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe+hEgwAAc1fgBAwWG///3sm
QEq////wUAP5bzqzW4DrNEEokNIY1GRiaZTU9o0GqbET1D1NGm0T0glJHpNMk8o9SeU09Jo2oAAA
AaNAEoIE0I1PU2QpvVHqGTQB6nqbU0AAHMABMmABMJgmEMARgASRI1MJkxEbIo/Qk0xppMjTCMRk
0zuajLqN5avz58lnmqEs+X4uQdTRQm89H1SlCTaYI2Kr3Vu3ZfDwqKon07xMYU8ajeTow4wko67G
Znk+VG77vqqf705LXUMlKO387we5LdzK8bTDC+jO7CTXdpkouucMUTBJ1CX6Ma23cVJrEKVLXBBZ
kzRlqEy6aHJBEHgmRmSF0iRa2coIBeGLmWVxMEownE4MkwOzrdtrJCTATCyCucIpgmkiQpKGBxil
m4aogJxpalBIB4v0bvNG6Qiwj+aQqplPCj3FE+J222mJytDc2Yneb3FblgRnCFnGQ7SphEvJJr3k
ZIDk+eeu/WR25sGhkyF2GEyGbTW6J1hiajWE3MFFvfrJUFaSF2/uJnLKCGaaENhhH+GGDaEGTHrA
cIq3jbamWOeJS7XizN8dOgsIPztDBRJRJIF15ORERrI3SxExeK55Y5orC/SUF1TvAm0lWeBstStY
sFnlcWGUrcxowfOaZLohgTek0JIlBWLjYUyWqxpBotYKX0y6aKGqyopTWDSrha6FzQIZLF6OMyLJ
YEwbCvE+JPuZ2X1XzueYXfqG63xRB6GNUU9dp8PPr/Wj69r6V8psuJVB5ejnzZY8FYyxm53KREIu
Ebwdw2VWCX5ZoY5dyuQVIH9RiTfmpn2wDDwDUWis9sbNSBG53E4fXOpug8qYfmpBNDU19pX1RC/A
iE0FAnqbAiXHPrrkcQpAnIY+kIlGS02QdfPzRyoJkvhrLB438C/bS0tZFEEd8H2ouxU1Xyq83q6t
dPowlNG40IqKJnpy7yjrpwztBamRQvRjwTQI3mZjjuZqE1a8wXtuNZMeOj5twTIqYTEHFI0KJoU/
QSvBkTa7pwqFpMeoNRa9abXHYV4816KonG8AOi9+PeudsgR6AdbMd25cgnTmiG+wpqnDp4WBpkC9
wcLEQUoDX7OGehN+AV4iHvBZWouFr1qbZxgckQoLuPRTooVVlZEHZJ66qiCwDsjFXLJNQRmTBvMS
jQCnUocP5KR90jnB12AuuCzbcFz3/NZt6qjk7NndFgu9WYkqhvsUgE3RE1PBDSvDURgsSwom1QTG
V3aEykswVJ7ItWTl8+pi313g1idnDmvAPcXiTWoL0q1cNd+GDDI7T5kBmbCYVRZ42WkwoBoOqbd9
hHFv/ikbIdoctO4cXEWSLUKkLAlRkFymRcTrDatB0tMp+Ri4rNA4dB0lxo1UlPAjUfAu5IpwoSHf
QiQY


--===============1412381999==--