Commit 308d1acd authored by unknown's avatar unknown

Bug#5005 collation cp852_bin makes server crash

ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.


sql/share/charsets/cp852.xml:
  Missing cp852_bin was added.
strings/ctype-simple.c:
  Check that unicode map was loaded
parent 53fd4439
...@@ -114,6 +114,8 @@ ...@@ -114,6 +114,8 @@
</map> </map>
</collation> </collation>
<collation name="cp852_bin" flag="binary"/>
</charset> </charset>
</charsets> </charsets>
...@@ -1171,6 +1171,15 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(uint)) ...@@ -1171,6 +1171,15 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(uint))
uni_idx idx[PLANE_NUM]; uni_idx idx[PLANE_NUM];
int i,n; 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 */ /* Clear plane statistics */
bzero(idx,sizeof(idx)); bzero(idx,sizeof(idx));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment