Some collation have been renamed to fit into convension

15 files changed, 50 insertions, 50 deletions

diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index cfafcc339bd..bbad5f95fe2 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -50,8 +50,8 @@ To make maintaining easier please:
 <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="dec8_bin"		id="69"	order="Binary"	flag="binary"/>
+  <collation name="dec8_swedish_ci"	id="3"	flag="primary">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -93,7 +93,7 @@ To make maintaining easier please:
   <alias>l1</alias>
   <alias>latin1</alias>
   <collation name="latin1_german1_ci"	id="5"	order="German Duden"/>
-  <collation name="latin1"		id="8"	order="Finnish, Swedish"	flag="primary"/>
+  <collation name="latin1_swedish_ci"	id="8"	order="Finnish, Swedish"	flag="primary"/>
   <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"/>
@@ -123,8 +123,8 @@ To make maintaining easier please:
   <family>Western</family>
   <description>HP West European</description>
   <alias>hproman8</alias>
-  <collation name="hp8_bin"	id="72"	order="Binary"		flag="binary"/>
-  <collation name="hp8"		id="6"	flag="primary">
+  <collation name="hp8_bin"		id="72"	order="Binary"	flag="binary"/>
+  <collation name="hp8_english_ci"	id="6"	flag="primary">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -141,16 +141,16 @@ To make maintaining easier please:
   <description>KOI8-R Relcom Russian</description>
   <alias>koi8-r</alias>
   <alias>cskoi8r</alias>
-  <collation name="koi8r"	id="7"	order="Russian"	flag="primary"/>
-  <collation name="koi8r_bin"	id="74"	order="Binary"	flag="binary"/>
+  <collation name="koi8r_general_ci"	id="7"	order="Russian"	flag="primary"/>
+  <collation name="koi8r_bin"		id="74"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="swe7">
   <family>Western</family>
   <description>7bit Swedish</description>
   <alias>iso-646-se</alias>
-  <collation name="swe7"	id="10"	order="Swedish"	flag="primary"/>
-  <collation name="swe7_bin"	id="82"	order="Binary"	flag="binary"/>
+  <collation name="swe7_swedish_ci"	id="10"	order="Swedish"	flag="primary"/>
+  <collation name="swe7_bin"		id="82"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="ascii">
@@ -161,8 +161,8 @@ To make maintaining easier please:
   <alias>csascii</alias>
   <alias>iso-ir-6</alias>
   <alias>iso646-us</alias>
-  <collation name="ascii"	id="11"	order="English"	flag="primary"/>
-  <collation name="ascii_bin"	id="65"	order="Binary"	flag="binary"/>
+  <collation name="ascii_general_ci"	id="11"	order="English"	flag="primary"/>
+  <collation name="ascii_bin"		id="65"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="ujis">
@@ -187,7 +187,7 @@ To make maintaining easier please:
   <alias>windows-1251</alias>
   <alias>ms-cyr</alias>
   <alias>ms-cyrillic</alias>
-  <collation name="cp1251"	id="14"	flag="primary">
+  <collation name="cp1251_bulgarian_ci"	id="14"	flag="primary">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -196,9 +196,9 @@ To make maintaining easier please:
     <order>Mongolian</order>
     <order>Ukrainian</order>
   </collation>
-  <collation name="win1251ukr" 		id="23"	order="Depreciated"/>
+  <collation name="cp1251_ukrainian_ci"	id="23"	order="Ukrainian"/>
   <collation name="cp1251_bin"		id="50"	order="Binary"	flag="binary"/>
-  <collation name="cp1251_ci"		id="51">
+  <collation name="cp1251_general_ci"	id="51">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -207,7 +207,7 @@ To make maintaining easier please:
     <order>Mongolian</order>
     <order>Ukrainian</order>
   </collation>
-  <collation name="cp1251_cs"		id="52">
+  <collation name="cp1251_general_cs"	id="52">
     <order>Belarusian</order>
     <order>Bulgarian</order>
     <order>Macedonian</order>
@@ -257,13 +257,13 @@ To make maintaining easier please:
   <alias>l7</alias>
   <collation name="latin7_estonian_ci"	id="20">
     <order>Estonian</order>
-    <flag>primary</flag>
   </collation>
-  <collation name="latin7_ci"		id="41">
+  <collation name="latin7_general_ci"	id="41">
     <order>Latvian</order>
     <order>Lithuanian</order>
+    <flag>primary</flag>
   </collation>
-  <collation name="latin7_cs"		id="42">
+  <collation name="latin7_general_cs"	id="42">
     <order>Latvian</order>
     <order>Lithuanian</order>
   </collation>
@@ -274,8 +274,8 @@ To make maintaining easier please:
   <family>Cyrillic</family>
   <description>KOI8-U Ukrainian</description>
   <alias>koi8-u</alias>
-  <collation name="koi8u"	id="22"	order="Ukranian"	flag="primary"/>
-  <collation name="koi8u_bin"	id="75"	order="Binary"	flag="binary"/>
+  <collation name="koi8u_general_ci"	id="22"	order="Ukranian"	flag="primary"/>
+  <collation name="koi8u_bin"		id="75"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="gb2312">
@@ -306,7 +306,7 @@ To make maintaining easier please:
   <description>Windows Central European</description>
   <alias>ms-ce</alias>
   <alias>windows-1250</alias>
-  <collation name="cp1250"	id="26"	flag="primary">
+  <collation name="cp1250_general_ci"	id="26"	flag="primary">
     <order>Hungarian</order>
     <order>Polish</order>
     <order>Romanian</order>
@@ -315,7 +315,7 @@ To make maintaining easier please:
     <order>Slovenian</order>
     <order>Sorbian</order>
   </collation>
-  <collation name="cp1250_czech"	id="34"	order="Czech"/>
+  <collation name="cp1250_czech_ci"	id="34"	order="Czech"/>
   <collation name="cp1250_bin"		id="66"	order="Binary"	flag="binary"/>
 </charset>
 
@@ -359,16 +359,16 @@ To make maintaining easier please:
   <alias>l5</alias>
   <alias>latin5</alias>
   <alias>turkish</alias>
-  <collation name="latin5"	id="30"	order="Turkish"	flag="primary"/>
-  <collation name="latin5_bin"	id="78"	order="Binary"	flag="binary"/>
+  <collation name="latin5_turkish_ci"	id="30"	order="Turkish"	flag="primary"/>
+  <collation name="latin5_bin"		id="78"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="armscii8">
   <family>South Asian</family>
   <description>ARMSCII-8 Armenian</description>
   <alias>armscii-8</alias>
-  <collation name="armscii8"	id="32"	order="Armenian"	flag="primary"/>
-  <collation name="armscii_bin"	id="64"	order="Binary"		flag="binary"/>
+  <collation name="armscii8_general_ci"	id="32"	order="Armenian"	flag="primary"/>
+  <collation name="armscii_bin"		id="64"	order="Binary"		flag="binary"/>
 </charset>
 
 <charset name="utf8">
@@ -392,8 +392,8 @@ To make maintaining easier please:
   <alias>csibm866</alias>
   <alias>ibm866</alias>
   <alias>DOSCyrillicRussian</alias>
-  <collation name="cp866"	id="36"	order="Russian"	flag="primary"/>
-  <collation name="cp866_bin"	id="68"	order="Binary"	flag="binary"/>
+  <collation name="cp866_general_ci"	id="36"	order="Russian"	flag="primary"/>
+  <collation name="cp866_bin"		id="68"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="keybcs2">
@@ -501,8 +501,8 @@ To make maintaining easier please:
   <description>Windows Arabic</description>
   <alias>ms-arab</alias>
   <alias>windows-1256</alias>
-  <collation name="cp1256_bin"	id="67"	order="Binary"	flag="binary"/>
-  <collation name="cp1256"	id="57"	order="Arabic"	flag="primary">
+  <collation name="cp1256_bin"		id="67"	order="Binary"	flag="binary"/>
+  <collation name="cp1256_general_ci"	id="57"	order="Arabic"	flag="primary">
     <order>Arabic</order>
     <order>Persian</order>
     <order>Pakistani</order>
diff --git a/sql/share/charsets/armscii8.xml b/sql/share/charsets/armscii8.xml
index 5012a3d84a9..1d9e33e3bc8 100644
--- a/sql/share/charsets/armscii8.xml
+++ b/sql/share/charsets/armscii8.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="armscii8">
+<collation name="armscii8_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
diff --git a/sql/share/charsets/ascii.xml b/sql/share/charsets/ascii.xml
index c94901b1ae7..1007f078f5a 100644
--- a/sql/share/charsets/ascii.xml
+++ b/sql/share/charsets/ascii.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="ascii">
+<collation name="ascii_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
diff --git a/sql/share/charsets/cp1250.xml b/sql/share/charsets/cp1250.xml
index b858fbff2a0..5ac63b836b0 100644
--- a/sql/share/charsets/cp1250.xml
+++ b/sql/share/charsets/cp1250.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="cp1250">
+<collation name="cp1250_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
@@ -114,7 +114,7 @@
 </map>
 </collation>
 
-<collation name="cp1250_czech"/>
+<collation name="cp1250_czech_ci"/>
 
 <collation name="cp1250_bin"	flag="binary"/>
 
diff --git a/sql/share/charsets/cp1251.xml b/sql/share/charsets/cp1251.xml
index 98dd1186c0c..795022cc179 100644
--- a/sql/share/charsets/cp1251.xml
+++ b/sql/share/charsets/cp1251.xml
@@ -94,7 +94,7 @@
 </unicode>
 
 
-<collation name="cp1251">
+<collation name="cp1251_bulgarian_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
@@ -119,7 +119,7 @@
 <collation name="cp1251_bin" flag="binary"/>
 
 
-<collation name="cp1251_ci">
+<collation name="cp1251_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
@@ -141,7 +141,7 @@
 </collation>
 
 
-<collation name="cp1251_cs">
+<collation name="cp1251_general_cs">
 <!--
 # Case insensitive, accent sensitive
 # Sort order is correct for Belarusian, Bulgarian, Macedonian,
@@ -170,7 +170,7 @@
 </collation>
 
 
-<collation name="win1251ukr">
+<collation name="cp1251_ukrainian_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/cp1256.xml b/sql/share/charsets/cp1256.xml
index a747c7c3a93..818a5583368 100644
--- a/sql/share/charsets/cp1256.xml
+++ b/sql/share/charsets/cp1256.xml
@@ -95,7 +95,7 @@
 </unicode>
 
 
-<collation name="cp1256">
+<collation name="cp1256_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
diff --git a/sql/share/charsets/cp866.xml b/sql/share/charsets/cp866.xml
index 43bab971bb3..f698e735b58 100644
--- a/sql/share/charsets/cp866.xml
+++ b/sql/share/charsets/cp866.xml
@@ -94,7 +94,7 @@
 </unicode>
 
 
-<collation name="cp866">
+<collation name="cp866_general_ci">
 <!--  Case insensitive, accent sensitive -->
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
diff --git a/sql/share/charsets/dec8.xml b/sql/share/charsets/dec8.xml
index 7b40041ec53..f1bcfd05b30 100644
--- a/sql/share/charsets/dec8.xml
+++ b/sql/share/charsets/dec8.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="dec8">
+<collation name="dec8_swedish_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
@@ -114,7 +114,7 @@
 </map>
 </collation>
 
-<collation name="dec_bin" flag="binary"/>
+<collation name="dec8_bin" flag="binary"/>
 
 </charset>
 
diff --git a/sql/share/charsets/hp8.xml b/sql/share/charsets/hp8.xml
index 619297fa988..0e16551b1b6 100644
--- a/sql/share/charsets/hp8.xml
+++ b/sql/share/charsets/hp8.xml
@@ -94,7 +94,7 @@
 </unicode>
 
 
-<collation name="hp8">
+<collation name="hp8_english_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/koi8r.xml b/sql/share/charsets/koi8r.xml
index c5aeea23997..b8bfc8ecccc 100644
--- a/sql/share/charsets/koi8r.xml
+++ b/sql/share/charsets/koi8r.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="koi8r">
+<collation name="koi8r_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
diff --git a/sql/share/charsets/koi8u.xml b/sql/share/charsets/koi8u.xml
index fd963ff0da5..0c05f2f1195 100644
--- a/sql/share/charsets/koi8u.xml
+++ b/sql/share/charsets/koi8u.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="koi8u">
+<collation name="koi8u_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
diff --git a/sql/share/charsets/latin1.xml b/sql/share/charsets/latin1.xml
index 1931f310d0b..9e11be39ad6 100644
--- a/sql/share/charsets/latin1.xml
+++ b/sql/share/charsets/latin1.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin1">
+<collation name="latin1_swedish_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/latin5.xml b/sql/share/charsets/latin5.xml
index c73cc645d42..963691ad110 100644
--- a/sql/share/charsets/latin5.xml
+++ b/sql/share/charsets/latin5.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin5">
+<collation name="latin5_turkish_ci">
 <!--
 # Note: all accented characters are compared separately (this
 # is different from the default latin1 character set, where
diff --git a/sql/share/charsets/latin7.xml b/sql/share/charsets/latin7.xml
index 8fe8a5fbcb5..d50601b5a90 100644
--- a/sql/share/charsets/latin7.xml
+++ b/sql/share/charsets/latin7.xml
@@ -115,7 +115,7 @@
 </collation>
 
 
-<collation name="latin7_ci">
+<collation name="latin7_general_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">
+<collation name="latin7_general_cs">
 <!-- Created for case-insensitive record search -->
 <!-- Created by Andis & Rihards                 -->
 <map>
diff --git a/sql/share/charsets/swe7.xml b/sql/share/charsets/swe7.xml
index 2768768cd9b..5bcf9a6501b 100644
--- a/sql/share/charsets/swe7.xml
+++ b/sql/share/charsets/swe7.xml
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="swe7">
+<collation name="swe7_swedish_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