diff options
| author | unknown <bar@mysql.com> | 2005-04-04 18:04:29 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-04-04 18:04:29 +0500 |
| commit | 73ddce6dbcbbeaf9660343acbf107ce113c3b503 (patch) | |
| tree | b1c6bb83932f46f583f8688aad4554f080c1d415 /strings | |
| parent | c2a3c28927b5907d92ea3b4815d823c632eb6dcb (diff) | |
| parent | 07182f5aca265bb9686209fd608e3ca136cd6f49 (diff) | |
| download | mariadb-git-73ddce6dbcbbeaf9660343acbf107ce113c3b503.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
strings/ctype-uca.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 80fe0167cdd..3204bd2e1f6 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -6651,8 +6651,7 @@ static const char slovak[]= static const char spanish2[]= /* Also good for Asturian and Galician */ "&C < ch <<< Ch <<< CH" "&L < ll <<< Ll <<< LL" - "&N < \\u00F1 <<< \\u00D1" - "&R << rr <<< Rr <<< RR"; + "&N < \\u00F1 <<< \\u00D1"; static const char roman[]= /* i.e. Classical Latin */ "& I << j <<< J " |