diff options
| author | unknown <bar@mysql.com> | 2004-06-14 21:55:36 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-06-14 21:55:36 +0500 |
| commit | a616c3dfbcb70dd47e68985c1c194f5fba8ef2d8 (patch) | |
| tree | fc05861dff937c062dd829161b3613cdf729cc21 /strings | |
| parent | 10ce930c531ad7adee2cb1990f611abd0a731434 (diff) | |
| download | mariadb-git-a616c3dfbcb70dd47e68985c1c194f5fba8ef2d8.tar.gz | |
utf8 contraction fix.
Polish collation fix.
Slovak collation fix.
Testing all language orders.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index d040d116d00..5fffc8e86cc 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -6586,7 +6586,7 @@ static const char polish[]= "& N < \\u0144 <<< \\u0143 " "& O < \\u00F3 <<< \\u00D3 " "& S < \\u015B <<< \\u015A " - "& Z < \\u017A <<< \\u017B "; + "& Z < \\u017A <<< \\u0179 < \\u017C <<< \\u017B"; static const char estonian[]= "& S < \\u0161 <<< \\u0160 " @@ -6889,9 +6889,9 @@ static int my_uca_scanner_next_any(my_uca_scanner *scanner) scanner->sbeg, scanner->send)) >=0) && (!(page1= (wc >> 8))) && - ((code1= wc & 0xFF) > 0x40) && + ((code1= (wc & 0xFF)) > 0x40) && (code1 < 0x80) && - (cweight= scanner->contractions[(scanner->code-0x40)*0x40+scanner->sbeg[1]-0x40])) + (cweight= scanner->contractions[(scanner->code-0x40)*0x40 + code1-0x40])) { scanner->implicit[0]= 0; scanner->wbeg= scanner->implicit; @@ -7137,6 +7137,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs, dst[1]= s_res & 0xFF; dst+= 2; } + for ( ; dst < de; *dst++='\0'); return dst - dst_orig; } @@ -7919,7 +7920,7 @@ CHARSET_INFO my_charset_ucs2_general_uca= "ucs2", /* cs name */ "ucs2_unicode_ci", /* name */ "", /* comment */ - NULL, /* tailoring */ + "", /* tailoring */ NULL, /* ctype */ NULL, /* to_lower */ NULL, /* to_upper */ @@ -8271,7 +8272,7 @@ CHARSET_INFO my_charset_ucs2_slovak_uca_ci= "ucs2", /* cs name */ "ucs2_slovak_ci", /* name */ "", /* comment */ - lithuanian, /* tailoring */ + slovak, /* tailoring */ NULL, /* ctype */ NULL, /* to_lower */ NULL, /* to_upper */ @@ -8723,7 +8724,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci= "utf8", /* cs name */ "utf8_slovak_ci", /* name */ "", /* comment */ - lithuanian, /* tailoring */ + slovak, /* tailoring */ ctype_utf8, /* ctype */ NULL, /* to_lower */ NULL, /* to_upper */ |