From: Alexander Barkov
Date: December 7 2009 1:10pm
Subject: bzr commit into mysql-6.0-codebase-bugfixing branch (bar:3756) Bug#47756
List-Archive: http://lists.mysql.com/commits/93060
X-Bug: 47756
Message-Id: <200912071311.nB7DB0wX002891@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1342127836=="

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

#At file:///home/bar/mysql-bzr/mysql-6.0-codebase-bugfixing/ based on revid:alik@stripped

 3756 Alexander Barkov	2009-12-07 [merge]
      Merging Bug#47756 from mysql-next-mr-bugfixing.

    modified:
      mysql-test/r/ctype_ldml.result
      mysql-test/t/ctype_ldml.test
      mysys/charset.c
=== modified file 'mysql-test/r/ctype_ldml.result'
--- a/mysql-test/r/ctype_ldml.result	2009-11-12 12:22:31 +0000
+++ b/mysql-test/r/ctype_ldml.result	2009-12-07 13:09:48 +0000
@@ -403,3 +403,8 @@ latin1_test	latin1	360			0
 select "foo" = "foo " collate latin1_test;
 "foo" = "foo " collate latin1_test
 1
+SET NAMES utf8 COLLATE utf8_phone_ci;
+SHOW COLLATION LIKE 'utf8_phone_ci';
+Collation	Charset	Id	Default	Compiled	Sortlen
+utf8_phone_ci	utf8	352			8
+SET NAMES utf8;

=== modified file 'mysql-test/t/ctype_ldml.test'
--- a/mysql-test/t/ctype_ldml.test	2009-11-12 12:22:31 +0000
+++ b/mysql-test/t/ctype_ldml.test	2009-12-07 13:09:48 +0000
@@ -145,3 +145,10 @@ DROP TABLE t1;
 set names latin1;
 show collation like 'latin1_test';
 select "foo" = "foo " collate latin1_test;
+
+#
+# Bug#47756 Setting 2byte collation ID with 'set names' crashes the server
+#
+SET NAMES utf8 COLLATE utf8_phone_ci;
+SHOW COLLATION LIKE 'utf8_phone_ci';
+SET NAMES utf8;

=== modified file 'mysys/charset.c'
--- a/mysys/charset.c	2009-10-15 11:12:52 +0000
+++ b/mysys/charset.c	2009-12-07 13:09:48 +0000
@@ -258,7 +258,9 @@ static int add_collation(CHARSET_INFO *c
       {
 #if defined (HAVE_CHARSET_utf8mb3) && defined(HAVE_UCA_COLLATIONS)
         copy_uca_collation(newcs, &my_charset_utf8mb3_unicode_ci);
-        newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED;
+        newcs->ctype= my_charset_utf8mb3_unicode_ci.ctype;
+        if (init_state_maps(newcs))
+          return MY_XML_ERROR;
 #endif
       }
       else


--===============1342127836==
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-6.0-codebase-\
#   bugfixing/
# testament_sha1: eaabd568fc44610baf93b580e99b27e0bb6b5cb1
# timestamp: 2009-12-07 17:11:00 +0400
# source_branch: file:///home/bar/mysql-bzr/mysql-next-mr.b47756/
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--===============1342127836==--