From: Alexander Barkov
Date: December 15 2010 11:35am
Subject: bzr push into mysql-trunk-bugfixing branch (bar:3429 to 3430) WL#4616
List-Archive: http://lists.mysql.com/commits/126919
Message-Id: <201012151136.oBFBa4PZ021264@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0851192114=="

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

 3430 Alexander Barkov	2010-12-15
      WL#4616 UTF16-LE
      Additional patch, to fix Valrgind warnings.

    modified:
      sql/sys_vars.cc
 3429 Alexander Barkov	2010-12-15 [merge]
      Merging from mysql-5.5-bugteam

    modified:
      mysql-test/r/ctype_many.result
      mysql-test/t/ctype_many.test
      strings/ctype-ucs2.c
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-12-14 13:26:35 +0000
+++ b/sql/sys_vars.cc	2010-12-15 11:35:10 +0000
@@ -480,16 +480,19 @@ static bool check_charset(sys_var *self,
   if (var->value->result_type() == STRING_RESULT)
   {
     String str(buff, sizeof(buff), system_charset_info), *res;
-    if (!(res=var->value->val_str_ascii(&str)))
+    if (!(res= var->value->val_str(&str)))
       var->save_result.ptr= NULL;
-    else if (!(var->save_result.ptr= get_charset_by_csname(res->c_ptr(),
-                                                           MY_CS_PRIMARY,
-                                                           MYF(0))) &&
-             !(var->save_result.ptr= get_old_charset_by_name(res->c_ptr())))
+    else
     {
-      ErrConvString err(res);
-      my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), err.ptr());
-      return true;
+      ErrConvString err(res); /* Get utf8 '\0' terminated string */
+      if (!(var->save_result.ptr= get_charset_by_csname(err.ptr(),
+                                                         MY_CS_PRIMARY,
+                                                         MYF(0))) &&
+          !(var->save_result.ptr= get_old_charset_by_name(err.ptr())))
+      {
+        my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), err.ptr());
+        return true;
+      }
     }
   }
   else // INT_RESULT
@@ -598,13 +601,16 @@ static bool check_collation_not_null(sys
   if (var->value->result_type() == STRING_RESULT)
   {
     String str(buff, sizeof(buff), system_charset_info), *res;
-    if (!(res= var->value->val_str_ascii(&str)))
+    if (!(res= var->value->val_str(&str)))
       var->save_result.ptr= NULL;
-    else if (!(var->save_result.ptr= get_charset_by_name(res->c_ptr(), MYF(0))))
+    else
     {
-      ErrConvString err(res);
-      my_error(ER_UNKNOWN_COLLATION, MYF(0), err.ptr());
-      return true;
+      ErrConvString err(res); /* Get utf8 '\0'-terminated string */
+      if (!(var->save_result.ptr= get_charset_by_name(err.ptr(), MYF(0))))
+      {
+        my_error(ER_UNKNOWN_COLLATION, MYF(0), err.ptr());
+        return true;
+      }
     }
   }
   else // INT_RESULT


--===============0851192114==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bar@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bar@stripped
# target_branch: file:///home/bar/mysql-bzr/mysql-trunk-bugfixing/
# testament_sha1: cb09d346af4a0ee30a18bb3ebebb24a827e85174
# timestamp: 2010-12-15 14:36:04 +0300
# source_branch: file:///home/bar/mysql-bzr/mysql-5.5-bugteam/
# base_revision_id: bar@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeWuEfMAAiDfgFUQeff//3vv
36S////6UASeRsqpZTPcEgCUTUCp+Kn6U/SnlH6KNlHqeU8p6h6nij1NpPRkT1D1PCn6p4UDKEyj
0wIp5T1PUTaekZRmkwAE0abUAaAyaHGjJkYRiAYTQYBNBoGTJoyZDCAwkkqbMo1Mh5T1Bp6nqNqG
gA0AGgaAAaAJJBAmJk0aGhMNJT9U9GUNqYQZHqeoaNADalJIgLuD/d5Oc5/6x/Q3bXhwfgUnI8hi
/AmPNwtpvQuqEhwxyyQHRe69IE5IGCeQ8Ql/Eym7x5szJfD3iTT1L9MUrTQvKrlKs5GxDA73NCz/
GnCWEm51xi7c4dMib7Mq0qMfJxH6CyREGMMVFFrz0Yd8aOVDTgtykI4SsifYFLCM4yoXw9agMQxK
oKMcjERG542a3FOA8xYCMImoIHp3NGGFJtD82XNC4G5AR/gokSIcd4axi6u6CRy/k2g4T27S7S4Q
9I7h+lRKIpokU/+2PWaBxFMmHOkU/tyAos7tpFPER7nhJ5qDSbH7iQT4YwRTGlTtEqKgzSIgsNXi
9JAsOPe6simsQ3E2uyyzlZqXAmoEc7z54ayjKSwGLYORXxFNsLRRkK3NTgMh9DkCZvWy1JWDaWhD
71JC59KRjFRVbM+QKI4rBARXWXOslftDX4bcA5Ms5nyGkt2NdqueIkVzCmPjrHx10ioWESGEs5MK
KoSvcFkXIdSqIbodfa9t9Rc4S1ICamdLqF4msNEaQ+VGyEqRW0LNZZM5RBNckiIpl5jPc+orzUUv
gXkK7HmBdWQJFG/OUQoTrYIaSSdpbnEZnorleIgghWufEJ9BdS4XYJeqyjWMty8iRohTt4Z6nqkc
oos+rom2Qigz5DjsNAPSG+du06SVuP9vxorczkREsMZnz/816fJ8B7qIxKjXUZsEeJUaNMViHFvB
Y7nsDzqGZL2tjGKNhHgy5C28jGbFpk8UoTWjV0cMFR/d1vodqIKSIdn5asmQfkHTJDVzmiyUD1wP
oZhXcqr7Y8CLmIDj7etMPgcun3PGS7CJmlpInRlLIz1ntqDDtsK1LOdow4u5k9oare+QdgbgmDtJ
2+8OT52r3/QHDfg/NkQmTQPUYXHjzPKLsbQwTmdataTU4XGE2yVMrZPNQxyGBhi6VQDlYOXkYqhX
piAs5uqU04broG00m4xGIkhKcFbFefheZulrzsHBw966+i+VEZV011wszLAGUCpt4rQNd7FBR270
0MT8jEyKBbvNeoK6g76+e26TQFPWGWrKRx9OdGqtnkurSGbZ1IWAUhS4IHXyXc/Pvd8wpR6mgThO
Ibo6lQCGqkgWaJeM0pJ8R3kkTwJTuvE5T2WqeSMhoqxiJW68tTslETJ45ZFM0espKAT0UdZGEArq
DlY05JXilymZNWI6c1WJon74F4Vy8rKFC/XalWWDh6HIgnp6Q8YgHocjoGtbzLjoOVMlIT5FAszk
MZJbLCgU6XgMTA2SZMnG+XcPI8dHeoZC6Zen1c4FuINSuztF8k02UFUUBOf0YEFCXQ8wtXoE9QZE
GqGM8HsWUVsT7D1ya78pompCtMbEMMmPtHwKpnqWwq05SQ49lKe2YpN1tRtDkomC0KKsFC1zdBOV
Sy9Bjz/SXizRBcyrIOFNRsO8P/F3JFOFCQ5a4R8w


--===============0851192114==--