summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <bar@deer.(none)>2004-06-18 10:24:31 +0500
committerunknown <bar@deer.(none)>2004-06-18 10:24:31 +0500
commit5ae0cb486c9bcef6807b6f220e75031c9648e7fc (patch)
tree7eba5d8563fb0025f0b301cfec129c8b1da8934f /strings
parentcbfe9f05174eefc4fe2dcf97c4ca32d2087c32db (diff)
downloadmariadb-git-5ae0cb486c9bcef6807b6f220e75031c9648e7fc.tar.gz
ctype-uca.c:
Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined. strings/ctype-uca.c: Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-uca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 2e03bc8718e..224c3db0f28 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -7668,7 +7668,7 @@ static int my_coll_rule_parse(MY_COLL_RULE *rule, size_t mitems,
weights applying tailorings, i.e. a set of
alternative weights for some characters.
- The default UCA weights are stored in my_charset_ucs2_general_uca.
+ The default UCA weights are stored in uca_weight/uca_length.
They consist of 256 pages, 256 character each.
If a page is not overwritten by tailoring rules,
@@ -7685,8 +7685,8 @@ static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(uint))
char errstr[128];
uchar *newlengths;
uint16 **newweights;
- const uchar *deflengths= my_charset_ucs2_general_uca.sort_order;
- uint16 **defweights= my_charset_ucs2_general_uca.sort_order_big;
+ const uchar *deflengths= uca_length;
+ uint16 **defweights= uca_weight;
int rc, i;
int ncontractions= 0;