Commit 330e3b1f authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents 05589d79 0ce3a41e

sql/share/charsets/cp852.xml

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
</map>

</collation>



<collation name="cp852_bin"	flag="binary"/>



</charset>



</charsets>

strings/ctype-simple.c

+9 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,15 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(uint)) 
  uni_idx	idx[PLANE_NUM];

  int		i,n;

  

  /*

    Check that Unicode map is loaded.

    It can be not loaded when the collation is

    listed in Index.xml but not specified

    in the character set specific XML file.

  */

  if (!cs->tab_to_uni)

    return TRUE;

  

  /* Clear plane statistics */

  bzero(idx,sizeof(idx));