diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-07-08 13:59:53 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-07-08 13:59:53 +0300 |
| commit | 80e005737b921624a7cf9d6dbdea6597897341e1 (patch) | |
| tree | 18e488e5af655313b366ba7afd4e699d7f689c11 | |
| parent | fb0aa2166cd4bcbe8a00bef56ad7d6ecdf912933 (diff) | |
| parent | d1bb34d270f3a473913749717b295c116b7cb944 (diff) | |
| download | mariadb-git-80e005737b921624a7cf9d6dbdea6597897341e1.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
| -rw-r--r-- | mysql-test/r/ctype_uca.result | 3 | ||||
| -rw-r--r-- | strings/ctype-uca.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result index 51da05f9fee..2fd654da434 100644 --- a/mysql-test/r/ctype_uca.result +++ b/mysql-test/r/ctype_uca.result @@ -1736,9 +1736,10 @@ T,t,Ţ,ţ,Ť,ť ƫ Ƭ,ƭ Ʈ -U,V,u,v,Ù,Ú,Û,Ü,ù,ú,û,ü,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ű,ű,Ų,ų,Ư,ư,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ +Ù,Ú,Û,Ü,ù,ú,û,ü,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ű,ű,Ų,ų,Ư,ư,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ Ɯ Ʊ +U,V,u,v Ʋ W,w,Ŵ,ŵ X,x diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 9590b98e664..1b49abd0fbb 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -6655,7 +6655,7 @@ static const char spanish2[]= /* Also good for Asturian and Galician */ static const char roman[]= /* i.e. Classical Latin */ "& I << j <<< J " - "& U << v <<< V "; + "& V << u <<< U "; /* Unicode Collation Algorithm: |