diff options
| author | bar@bar.mysql.r18.ru <> | 2003-03-25 12:07:46 +0400 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-03-25 12:07:46 +0400 |
| commit | 1c5dd1f53395296696a8ddef3e89a15c2afc3c38 (patch) | |
| tree | a30024fec0127bf4e7df49a1060f65ac8218f337 /sql/share | |
| parent | 028c35847f5af56ee9e14e55784e1a47af095001 (diff) | |
| download | mariadb-git-1c5dd1f53395296696a8ddef3e89a15c2afc3c38.tar.gz | |
Collation names have been renamed to common style
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/charsets/Index.xml | 15 | ||||
| -rw-r--r-- | sql/share/charsets/latin7.xml | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 4d54b8b53ce..4f0e4ff2157 100644 --- a/sql/share/charsets/Index.xml +++ b/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> diff --git a/sql/share/charsets/latin7.xml b/sql/share/charsets/latin7.xml index 89c14a3acd8..da57fee105f 100644 --- a/sql/share/charsets/latin7.xml +++ b/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> |