mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
unknown 2004-08-12 07:49:13 +02:00
commit 330e3b1f8c
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/share/charsets/cp852.xml
View file

@ -114,6 +114,8 @@
</map>
</collation>
<collation name="cp852_bin" flag="binary"/>
</charset>
</charsets>

9
strings/ctype-simple.c
View file

@ -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));