MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:December 15 2009 10:10am
Subject:bzr commit into mysql-pe branch (bar:3776) Bug#49134
View as plain text  
#At file:///home/bar/mysql-bzr/mysql-pe/ based on revid:jon.hauglid@stripped

 3776 Alexander Barkov	2009-12-15 [merge]
      Merging Bug#49134 from mysql-5.1-bugteam

    modified:
      mysql-test/std_data/Index.xml
      mysys/charset.c
=== modified file 'mysql-test/std_data/Index.xml'
--- a/mysql-test/std_data/Index.xml	2009-11-09 10:12:52 +0000
+++ b/mysql-test/std_data/Index.xml	2009-12-15 10:08:17 +0000
@@ -18,6 +18,13 @@
       </rules>
     </collation>
 
+    <collation name="utf8_hugeid_ci" id="2047000000">
+      <rules>
+        <reset>a</reset>
+        <s>b</s>
+      </rules>
+    </collation>
+
     <collation name="utf8_maxuserid_ci" id="2047">
       <rules>
         <reset>a</reset>

=== modified file 'mysys/charset.c'
--- a/mysys/charset.c	2009-12-12 18:24:17 +0000
+++ b/mysys/charset.c	2009-12-15 10:08:17 +0000
@@ -220,7 +220,8 @@ copy_uca_collation(CHARSET_INFO *to, CHA
 static int add_collation(CHARSET_INFO *cs)
 {
   if (cs->name && (cs->number ||
-                   (cs->number=get_collation_number_internal(cs->name))))
+                   (cs->number=get_collation_number_internal(cs->name))) &&
+      cs->number < array_elements(all_charsets))
   {
     if (!all_charsets[cs->number])
     {


Attachment: [text/bzr-bundle] bzr/bar@mysql.com-20091215100817-37voq2gdchbct3p2.bundle
Thread
bzr commit into mysql-pe branch (bar:3776) Bug#49134Alexander Barkov15 Dec