Skip to content

M
mariadb
Commit 856378bd authored by bar@mysql.com's avatar bar@mysql.com
Browse files
Options

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

into mysql.com:/usr/home/bar/mysql-5.0
parents ac2efb13 d9f8b501
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
mysql-test/r/ctype_uca.result
View file @ 856378bd
...@@ -1759,8 +1759,8 @@ P,p ...@@ -1759,8 +1759,8 @@ P,p
Ƥ,ƥ Ƥ,ƥ
Q,q Q,q
ĸ ĸ
R,RR,Rr,r,rr,Ŕ,ŕ,Ŗ,ŗ,Ř,ř R,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř
rR RR,Rr,rR,rr
Ʀ Ʀ
S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ
SS,Ss,sS,ss,ß SS,Ss,sS,ss,ß
......
strings/ctype-uca.c
View file @ 856378bd
...@@ -6651,8 +6651,7 @@ static const char slovak[]= ...@@ -6651,8 +6651,7 @@ static const char slovak[]=
static const char spanish2[]= /* Also good for Asturian and Galician */ static const char spanish2[]= /* Also good for Asturian and Galician */
"&C < ch <<< Ch <<< CH" "&C < ch <<< Ch <<< CH"
"&L < ll <<< Ll <<< LL" "&L < ll <<< Ll <<< LL"
"&N < \\u00F1 <<< \\u00D1" "&N < \\u00F1 <<< \\u00D1";
"&R << rr <<< Rr <<< RR";
static const char roman[]= /* i.e. Classical Latin */ static const char roman[]= /* i.e. Classical Latin */
"& I << j <<< J " "& I << j <<< J "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7