latin7.xml:

  c
Index.xml:
  Collation names form lati7 were mixed

sql/share/charsets/Index.xml

@@ -284,7 +284,7 @@ To make maintaining easier please:
   <alias>BalticRim</alias>
   <alias>iso-8859-13</alias>
   <alias>l7</alias>
-  <collation name="latin7_estonian_ci"	id="20">
+  <collation name="latin7_estonian_cs"	id="20">
     <order>Estonian</order>
   </collation>
   <collation name="latin7_general_ci"	id="41">

sql/share/charsets/latin7.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="latin7_estonian_ci">
+<collation name="latin7_estonian_cs">
 <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_general_ci">
+<collation name="latin7_general_cs">
 <!-- 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_general_cs">
+<collation name="latin7_general_ci">
 <!-- Created for case-insensitive record search -->
 <!-- Created by Andis & Rihards                 -->
 <map>