German Phone book collation is always compiled

Some collation names have been renamed


BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  Delete: strings/ctype-latin1_de.c
libmysql/Makefile.shared:
  German Phone book collation is always compiled
mysql-test/r/ctype_collate.result:
  Some collation names have been renamed
mysql-test/t/ctype_collate.test:
  Some collation names have been renamed
mysql-test/t/ctype_latin1_de-master.opt:
  Some collation names have been renamed
mysys/charset.c:
  get_charset_by_name() now will find its default collation if charset name is passed
sql/share/charsets/Index.xml:
  Some collation names have been renamed
sql/share/charsets/cp1251.xml:
  Some collation names have been renamed
sql/share/charsets/cp1257.xml:
  Some collation names have been renamed
sql/share/charsets/latin1.xml:
  Some collation names have been renamed
sql/share/charsets/latin2.xml:
  Some collation names have been renamed
sql/share/charsets/latin7.xml:
  Some collation names have been renamed
sql/share/charsets/macce.xml:
  Some collation names have been renamed
sql/share/charsets/macroman.xml:
  Some collation names have been renamed
sql/sql_show.cc:
  Nicer output from SHOW COLLATION
strings/Makefile.am:
  German Phone book collation is always compiled
strings/ctype-czech.c:
  Some collation names have been renamed
strings/ctype-extra.c:
  Don't compile dynamic charset. We should decide names convension before 
  making this available.
strings/ctype-latin1.c:
  German Phone book collation is always compiled

8 files changed, 45 insertions, 62 deletions

diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index ffc6d30100c..974c2968e55 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -32,8 +32,8 @@ To make maintaining easier please:
   <alias>iso_8859-2</alias>
   <alias>iso_8859-2:1987</alias>
   <alias>l2</alias>
-  <collation name="czech" 	id="2"	order="Czech" flag="compiled"/>
-  <collation name="latin2"	id="9"	flag="primary">
+  <collation name="latin2_czech_ci" 	id="2"	order="Czech" flag="compiled"/>
+  <collation name="latin2_general_ci"	id="9"	flag="primary">
     <order>Hungarian</order>
     <order>Polish</order>
     <order>Romanian</order>
@@ -42,16 +42,16 @@ To make maintaining easier please:
     <order>Slovenian</order>
     <order>Sorbian</order>
   </collation>
-  <collation name="hungarian"	id="21"	order="Hungarian"/>
-  <collation name="croat"	id="27"	order="Croatian"/>
+  <collation name="latin2_hungarian_ci"		id="21"	order="Hungarian"/>
+  <collation name="latin2_croatian_ci"		id="27"	order="Croatian"/>
   <collation name="latin2_bin"	id="77"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="dec8">
   <family>Western</family>
   <description>DEC West European</description>
-  <collation name="dec_bin"	id="69"	order="Binary"	flag="binary"/>
-  <collation name="dec8"	id="3"	flag="primary">
+  <collation name="dec_bin"		id="69"	order="Binary"	flag="binary"/>
+  <collation name="dec8"		id="3"	flag="primary">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -93,12 +93,12 @@ To make maintaining easier please:
   <alias>iso_8859-1:1987</alias>
   <alias>l1</alias>
   <alias>latin1</alias>
-  <collation name="german1"		id="5"	order="German Duden"/>
+  <collation name="latin1_german1_ci"	id="5"	order="German Duden"/>
   <collation name="latin1"		id="8"	order="Finnish, Swedish"	flag="primary"/>
-  <collation name="danish"		id="15"	order="Danish"/>
-  <collation name="latin1_de"		id="31"	order="German DIN"	flag="compiled"/>
-  <collation name="latin1_bin"		id="47"	order="Binary"		flag="binary"/>
-  <collation name="latin1_ci_as"	id="48">
+  <collation name="latin1_danish_ci"	id="15"	order="Danish"/>
+  <collation name="latin1_german2_ci"	id="31"	order="German Phonebook"	flag="compiled"/>
+  <collation name="latin1_bin"		id="47"	order="Binary"			flag="binary"/>
+  <collation name="latin1_general_ci"	id="48">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -108,7 +108,7 @@ To make maintaining easier please:
     <order>Pogtuguese</order>
     <order>Spanish</order>
   </collation>
-  <collation name="latin1_cs_as"	id="49">
+  <collation name="latin1_general_cs"	id="49">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -199,7 +199,7 @@ To make maintaining easier please:
   </collation>
   <collation name="win1251ukr" 		id="23"	order="Depreciated"/>
   <collation name="cp1251_bin"		id="50"	order="Binary"	flag="binary"/>
-  <collation name="cp1251_ci_as"	id="51">
+  <collation name="cp1251_ci"		id="51">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -208,7 +208,7 @@ To make maintaining easier please:
     <order>Mongolian</order>
     <order>Ukrainian</order>
   </collation>
-  <collation name="cp1251_cs_as"	id="52">
+  <collation name="cp1251_cs"		id="52">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -256,15 +256,15 @@ To make maintaining easier please:
   <alias>BalticRim</alias>
   <alias>iso-8859-13</alias>
   <alias>l7</alias>
-  <collation name="latin7_estonian_ci_as"	id="20">
+  <collation name="latin7_estonian_ci"	id="20">
     <order>Estonian</order>
     <flag>primary</flag>
   </collation>
-  <collation name="latin7_ci_as"		id="41">
+  <collation name="latin7_ci"		id="41">
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
-  <collation name="latin7_cs_as"		id="42">
+  <collation name="latin7_cs"		id="42">
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
@@ -341,11 +341,11 @@ To make maintaining easier please:
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
-  <collation name="cp1257_ci_as"	id="60">
+  <collation name="cp1257_ci"		id="60">
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
-  <collation name="cp1257_cs_as"	id="61">
+  <collation name="cp1257_cs"		id="61">
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
@@ -417,7 +417,8 @@ To make maintaining easier please:
     <order>Sorbian</order>
   </collation>
   <collation name="macce_bin"	id="43"	order="Binary"	flag="binary"/>
-  <collation name="macce_ci_ai"	id="44">
+  <!--collation name="macce_ci_ai"	id="44"/-->
+  <collation name="macce_ci"	id="45">
     <order>Hungarian</order>
     <order>Polish</order>
     <order>Romanian</order>
@@ -426,16 +427,7 @@ To make maintaining easier please:
     <order>Slovenian</order>
     <order>Sorbian</order>
   </collation>
-  <collation name="macce_ci_as"	id="45">
-    <order>Hungarian</order>
-    <order>Polish</order>
-    <order>Romanian</order>
-    <order>Croatian</order>
-    <order>Slovak</order>
-    <order>Slovenian</order>
-    <order>Sorbian</order>
-  </collation>
-  <collation name="macce_cs_as"	id="46">
+  <collation name="macce_cs"	id="46">
     <order>Hungarian</order>
     <order>Polish</order>
     <order>Romanian</order>
@@ -463,17 +455,7 @@ To make maintaining easier please:
     <order>Spanish</order>
   </collation>
   <collation name="macroman_bin"	id="53"	order="Binary"	flag="binary"/>
-  <collation name="macroman_ci_as"	id="54">
-    <order>Dutch</order>
-    <order>English</order>
-    <order>French</order>
-    <order>German Duden</order>
-    <order>Italian</order>
-    <order>Latin</order>
-    <order>Pogtuguese</order>
-    <order>Spanish</order>
-  </collation>
-  <collation name="macroman_ci_ai"	id="55">
+  <collation name="macroman_ci"		id="54">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -483,7 +465,8 @@ To make maintaining easier please:
     <order>Pogtuguese</order>
     <order>Spanish</order>
   </collation>
-  <collation name="macroman_cs_as"	id="56">
+  <!--collation name="macroman_ci_ai"	id="55"/-->
+  <collation name="macroman_cs"		id="56">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
diff --git a/sql/share/charsets/cp1251.xml b/sql/share/charsets/cp1251.xml
index 79b71df9baf..98dd1186c0c 100644
--- a/sql/share/charsets/cp1251.xml
+++ b/sql/share/charsets/cp1251.xml
@@ -119,7 +119,7 @@
 <collation name="cp1251_bin" flag="binary"/>
 
 
-<collation name="cp1251_ci_as">
+<collation name="cp1251_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -141,7 +141,7 @@
 </collation>
 
 
-<collation name="cp1251_cs_as">
+<collation name="cp1251_cs">
 <!--
 # Case insensitive, accent sensitive
 # Sort order is correct for Belarusian, Bulgarian, Macedonian,
diff --git a/sql/share/charsets/cp1257.xml b/sql/share/charsets/cp1257.xml
index 7f1f8293aae..2966e5d1cfa 100644
--- a/sql/share/charsets/cp1257.xml
+++ b/sql/share/charsets/cp1257.xml
@@ -140,7 +140,7 @@
 </collation>
 
 
-<collation name="cp1257_ci_as">
+<collation name="cp1257_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -162,7 +162,7 @@
 </collation>
 
 
-<collation name="cp1257_cs_as">
+<collation name="cp1257_cs">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
diff --git a/sql/share/charsets/latin1.xml b/sql/share/charsets/latin1.xml
index 87abbe06f77..1931f310d0b 100644
--- a/sql/share/charsets/latin1.xml
+++ b/sql/share/charsets/latin1.xml
@@ -115,7 +115,7 @@
 </collation>
 
 
-<collation name="german1">
+<collation name="latin1_german1_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -137,7 +137,7 @@
 </collation>
 
 
-<collation name="danish">
+<collation name="latin1_danish_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -159,13 +159,13 @@
 </collation>
 
 
-<collation name="latin1_de"/>
+<collation name="latin1_german2_ci"/>
 
 
 <collation name="latin1_bin" flag="binary"/>
 
 
-<collation name="latin1_ci_as">
+<collation name="latin1_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -187,7 +187,7 @@
 </collation>
 
 
-<collation name="latin1_cs_as">
+<collation name="latin1_general_cs">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
diff --git a/sql/share/charsets/latin2.xml b/sql/share/charsets/latin2.xml
index 9be39dee47d..4de138d3ea0 100644
--- a/sql/share/charsets/latin2.xml
+++ b/sql/share/charsets/latin2.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin2">
+<collation name="latin2_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -115,7 +115,7 @@
 </collation>
 
 
-<collation name="croat">
+<collation name="latin2_croatian_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -137,10 +137,10 @@
 </collation>
 
 
-<collation name="czech"/>
+<collation name="latin2_czech_ci"/>
 
 
-<collation name="hungarian">
+<collation name="latin2_hungarian_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
diff --git a/sql/share/charsets/latin7.xml b/sql/share/charsets/latin7.xml
index da57fee105f..8fe8a5fbcb5 100644
--- a/sql/share/charsets/latin7.xml
+++ b/sql/share/charsets/latin7.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin7_estonian_ci_as">
+<collation name="latin7_estonian_ci">
 <map>
  00 02 03 04 05 06 07 08 09 2E 2F 30 31 32 0A 0B
  0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B
@@ -115,7 +115,7 @@
 </collation>
 
 
-<collation name="latin7_ci_as">
+<collation name="latin7_ci">
 <!-- Created for case-sensitive record search              -->
 <!-- by Andis Grasis & Rihards Grasis e-mail:andis@cata.lv -->
 <map>
@@ -139,7 +139,7 @@
 </collation>
 
 
-<collation name="latin7_cs_as">
+<collation name="latin7_cs">
 <!-- Created for case-insensitive record search -->
 <!-- Created by Andis & Rihards                 -->
 <map>
diff --git a/sql/share/charsets/macce.xml b/sql/share/charsets/macce.xml
index 056047e9b82..0f39cb14b31 100644
--- a/sql/share/charsets/macce.xml
+++ b/sql/share/charsets/macce.xml
@@ -139,7 +139,7 @@
 </collation>
 
 
-<collation name="macce_ci_as">
+<collation name="macce_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -162,7 +162,7 @@
 </collation>
 
 
-<collation name="macce_cs_as">
+<collation name="macce_cs">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
diff --git a/sql/share/charsets/macroman.xml b/sql/share/charsets/macroman.xml
index cc9448842b4..8c8a9070084 100644
--- a/sql/share/charsets/macroman.xml
+++ b/sql/share/charsets/macroman.xml
@@ -135,7 +135,7 @@
 </map>
 </collation>
 
-<collation name="macroman_ci_as">
+<collation name="macroman_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -156,7 +156,7 @@
 </map>
 </collation>
 
-<collation name="macroman_cs_as">
+<collation name="macroman_cs">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F