From fe404b68083120d61db8d57bddee04cc0befe63d Mon Sep 17 00:00:00 2001 From: "monty@hundin.mysql.fi" <> Date: Thu, 13 Sep 2001 11:00:22 +0300 Subject: [PATCH] =?UTF-8?q?Fixed=20sorting=20of=20=C3=A9=20in=20latin=5Fde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Docs/manual.texi | 8 ++++---- strings/ctype-latin1_de.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 8e89c9d09d2..0514b8d32d4 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -20463,13 +20463,13 @@ strings before doing the comparison: ß -> ss @end example -All accented characters, except @code{'é'} and @code{É} are converted to -their un-accented counterpart. All letters are converted to uppercase. +All accented characters, are converted to their un-accented uppercase +counterpart. All letters are converted to uppercase. When comparing strings with @code{LIKE} the one -> two character mapping is not done. All letters are converted to uppercase. Accent are removed -from all letters except: @code{Ü}, @code{ü}, @code{É}, @code{é}, @code{Ö}, -@code{ö}, @code{Ä} and @code{ä}. +from all letters except: @code{Ü}, @code{ü}, @code{Ö}, @code{ö}, +@code{Ä} and @code{ä}. @node Languages, Adding character set, Character sets, Localization diff --git a/strings/ctype-latin1_de.c b/strings/ctype-latin1_de.c index a0a9686e0c1..fa32c6d21f7 100644 --- a/strings/ctype-latin1_de.c +++ b/strings/ctype-latin1_de.c @@ -100,7 +100,7 @@ uchar to_upper_latin1_de[] = { * characters to their non-accented equivalents. Note: in this * table, 'ä' is mapped to 'A', 'ÿ' is mapped to 'Y', etc. - all * accented characters except the following are treated the same way. - * Ü, ü, É, é, Ö, ö, Ä, ä + * Ü, ü, Ö, ö, Ä, ä */ uchar sort_order_latin1_de[] = { @@ -116,9 +116,9 @@ uchar sort_order_latin1_de[] = { 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, - 65, 65, 65, 65,196, 65, 92, 67, 69,201, 69, 69, 73, 73, 73, 73, + 65, 65, 65, 65,196, 65, 92, 67, 69, 69, 69, 69, 73, 73, 73, 73, 68, 78, 79, 79, 79, 79,214,215,216, 85, 85, 85,220, 89,222,223, - 65, 65, 65, 65,196, 65, 92, 67, 69,201, 69, 69, 73, 73, 73, 73, + 65, 65, 65, 65,196, 65, 92, 67, 69, 69, 69, 69, 73, 73, 73, 73, 68, 78, 79, 79, 79, 79,214,247,216, 85, 85, 85,220, 89,222, 89 };