Collation names have been renamed to common style

sql/share/charsets/Index.xml

@@ -240,9 +240,18 @@ To make maintaining easier please:
   <alias>BalticRim</alias>
   <alias>iso-8859-13</alias>
   <alias>l7</alias>
-  <collation name="estonia"	id="20"	order="Estonian"	flag="primary"/>
-  <collation name="latvian"	id="41"	order="Latvian"/>
-  <collation name="latvian1"	id="42"	order="Latvian"/>
+  <collation name="latin7_estonian_ci_as"	id="20">
+    <order>Estonian</order>
+    <flag>primary</flag>
+  </collation>
+  <collation name="latin7_ci_as"		id="41">
+    <order>Latvian</order>
+    <order>Lithuanian</order>
+  </collation>
+  <collation name="latin7_cs_as"		id="42">
+    <order>Latvian</order>
+    <order>Lithuanian</order>
+  </collation>
   <collation name="latin7_bin"	id="79"	order="Binary"	flag="binary"/>
 </charset>
 

sql/share/charsets/latin7.xml

@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="estonia">
+<collation name="latin7_estonian_ci_as">
 <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="latvian">
+<collation name="latin7_ci_as">
 <!-- Created for case-sensitive record search              -->
 <!-- by Andis Grasis & Rihards Grasis e-mail:andis@cata.lv -->
 <map>
@@ -139,7 +139,7 @@
 </collation>
 
 
-<collation name="latvian1">
+<collation name="latin7_cs_as">
 <!-- Created for case-insensitive record search -->
 <!-- Created by Andis & Rihards                 -->
 <map>

strings/ctype-extra.c

@@ -3169,7 +3169,7 @@ CHARSET_INFO compiled_charsets[] = {
     20,0,0,		/* number */
     MY_CS_COMPILED,	/* state      */
     "latin7",		/* cs name    */
-    "estonia",		/* name */
+    "latin7_estonian_ci_as",		/* name */
     "",			/* comment    */
     ctype_estonia,
     to_lower_estonia,