Commit 73ddce6d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1 

into mysql.com:/usr/home/bar/mysql-5.0


strings/ctype-uca.c:
  Auto merged
parents c2a3c289 07182f5a

mysql-test/r/ctype_uca.result

+2 −2
Original line number Diff line number Diff line
@@ -1759,8 +1759,8 @@ P,p 
Ƥ,ƥ

Q,q

ĸ

R,RR,Rr,r,rr,Ŕ,ŕ,Ŗ,ŗ,Ř,ř

rR

R,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř

RR,Rr,rR,rr

Ʀ

S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ

SS,Ss,sS,ss,ß

strings/ctype-uca.c

+1 −2
Original line number Diff line number Diff line
@@ -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 "