summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/charsets/Index.xml90
-rw-r--r--sql/share/charsets/cp1257.xml2
-rw-r--r--sql/share/charsets/greek.xml2
-rw-r--r--sql/share/charsets/hebrew.xml2
-rw-r--r--sql/share/charsets/keybcs2.xml2
-rw-r--r--sql/share/charsets/macce.xml2
-rw-r--r--sql/share/charsets/macroman.xml2
7 files changed, 31 insertions, 71 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index ec93d68ea8f..9b95326fe9e 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -17,7 +17,7 @@ To make maintaining easier please:
<alias>big-five</alias>
<alias>cn-big5</alias>
<alias>csbig5</alias>
- <collation name="big5" id="1" order="Chinese">
+ <collation name="big5_chinese_ci" id="1" order="Chinese">
<flag>primary</flag>
<flag>compiled"</flag>
</collation>
@@ -169,7 +169,7 @@ To make maintaining easier please:
<family>Japanese</family>
<description>EUC-JP Japanese</description>
<alias>euc-jp</alias>
- <collation name="ujis" id="12" order="Japanese" flag="primary"/>
+ <collation name="ujis_japanese_ci" id="12" order="Japanese" flag="primary"/>
</charset>
<charset name="sjis">
@@ -178,7 +178,7 @@ To make maintaining easier please:
<alias>s-jis</alias>
<alias>shift-jis</alias>
<alias>x-sjis</alias>
- <collation name="sjis" id="13" order="Japanese" flag="primary"/>
+ <collation name="sjis_japanese_ci" id="13" order="Japanese" flag="primary"/>
</charset>
<charset name="cp1251">
@@ -224,15 +224,15 @@ To make maintaining easier please:
<alias>csisolatinhebrew</alias>
<alias>iso-8859-8</alias>
<alias>iso-ir-138</alias>
- <collation name="hebrew" id="16" order="Hebrew" flag="primary"/>
- <collation name="hebrew_bin" id="71" order="Binary" flag="binary"/>
+ <collation name="hebrew_general_ci" id="16" order="Hebrew" flag="primary"/>
+ <collation name="hebrew_bin" id="71" order="Binary" flag="binary"/>
</charset>
<charset name="tis620">
<family>Thai</family>
<description>TIS620 Thai</description>
<alias>tis-620</alias>
- <collation name="tis620" id="18" order="Thai">
+ <collation name="tis620_thai_ci" id="18" order="Thai">
<flag>primary</flag>
<flag>compiled</flag>
</collation>
@@ -243,7 +243,7 @@ To make maintaining easier please:
<description>EUC-KR Korean</description>
<alias>euc_kr</alias>
<alias>euc-kr</alias>
- <collation name="euckr" id="19" order="Korean">
+ <collation name="euckr_korean_ci" id="19" order="Korean">
<flag>primary</flag>
<flag>compiled"</flag>
</collation>
@@ -283,7 +283,7 @@ To make maintaining easier please:
<description>GB2312 Simplified Chinese</description>
<alias>chinese</alias>
<alias>iso-ir-58</alias>
- <collation name="gb2312" id="24" order="Chinese">
+ <collation name="gb2312_chinese_ci" id="24" order="Chinese">
<flag>primary</flag>
<flag>compiled"</flag>
</collation>
@@ -297,8 +297,8 @@ To make maintaining easier please:
<alias>greek8</alias>
<alias>iso-8859-7</alias>
<alias>iso-ir-126</alias>
- <collation name="greek" id="25" order="Greek" flag="primary"/>
- <collation name="greek_bin" id="70" order="Binary" flag="binary"/>
+ <collation name="greek_general_ci" id="25" order="Greek" flag="primary"/>
+ <collation name="greek_bin" id="70" order="Binary" flag="binary"/>
</charset>
<charset name="cp1250">
@@ -323,7 +323,7 @@ To make maintaining easier please:
<family>East Asian</family>
<description>GBK Simplified Chinese</description>
<alias>cp936</alias>
- <collation name="gbk" id="28" order="Chinese">
+ <collation name="gbk_chinese_ci" id="28" order="Chinese">
<flag>primary</flag>
<flag>compiled</flag>
</collation>
@@ -336,18 +336,12 @@ To make maintaining easier please:
<alias>windows-1257</alias>
<collation name="cp1257_lithuanian_ci" id="29" order="Lithuanian"/>
<collation name="cp1257_bin" id="58" order="Binary" flag="binary"/>
- <collation name="cp1257_ci_ai" id="59" flag="primary">
- <order>Latvian</order>
- <order>Lithuanian</order>
- </collation>
- <collation name="cp1257_ci" id="60">
- <order>Latvian</order>
- <order>Lithuanian</order>
- </collation>
- <collation name="cp1257_cs" id="61">
+ <collation name="cp1257_general_ci" id="59" flag="primary">
<order>Latvian</order>
<order>Lithuanian</order>
</collation>
+ <!--collation name="cp1257_ci" id="60"/-->
+ <!--collation name="cp1257_cs" id="61"/-->
</charset>
<charset name="latin5">
@@ -375,14 +369,14 @@ To make maintaining easier please:
<family>Unicode</family>
<description>UTF-8 Unicode</description>
<alias>utf-8</alias>
- <collation name="utf8" id="33" flag="primary"/>
- <collation name="utf8_bin" id="83" flag="binary"/>
+ <collation name="utf8_general_ci" id="33" flag="primary"/>
+ <collation name="utf8_bin" id="83" flag="binary"/>
</charset>
<charset name="ucs2">
<family>Unicode</family>
<description>UCS-2 Unicode</description>
- <collation name="ucs2" id="35" flag="primary"/>
+ <collation name="ucs2_general_ci" id="35" flag="primary"/>
</charset>
<charset name="cp866">
@@ -399,15 +393,15 @@ To make maintaining easier please:
<charset name="keybcs2">
<family>Central European</family>
<description>DOS Kamenicky Czech-Slovak</description>
- <collation name="keybcs2" id="37" order="Czech" flag="primary"/>
- <collation name="keybcs2_bin" id="73" order="Binary" flag="binary"/>
+ <collation name="keybcs2_general_ci" id="37" order="Czech" flag="primary"/>
+ <collation name="keybcs2_bin" id="73" order="Binary" flag="binary"/>
</charset>
<charset name="macce">
<family>Central European</family>
<description>Mac Central European</description>
<alias>MacCentralEurope</alias>
- <collation name="macce" id="38" flag="primary">
+ <collation name="macce_general_ci" id="38" flag="primary">
<order>Hungarian</order>
<order>Polish</order>
<order>Romanian</order>
@@ -418,24 +412,8 @@ To make maintaining easier please:
</collation>
<collation name="macce_bin" id="43" order="Binary" flag="binary"/>
<!--collation name="macce_ci_ai" id="44"/-->
- <collation name="macce_ci" 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" id="46">
- <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_ci" id="45"/-->
+ <!--collation name="macce_cs" id="46"/-->
</charset>
<charset name="macroman">
@@ -444,7 +422,7 @@ To make maintaining easier please:
<alias>Mac</alias>
<alias>Macintosh</alias>
<alias>csmacintosh</alias>
- <collation name="macroman" id="39" flag="primary">
+ <collation name="macroman_general_ci" id="39" flag="primary">
<order>Dutch</order>
<order>English</order>
<order>French</order>
@@ -455,27 +433,9 @@ To make maintaining easier please:
<order>Spanish</order>
</collation>
<collation name="macroman_bin" id="53" order="Binary" flag="binary"/>
- <collation name="macroman_ci" id="54">
- <order>Dutch</order>
- <order>English</order>
- <order>French</order>
- <order>German Duden</order>
- <order>Italian</order>
- <order>Latin</order>
- <order>Portuguese</order>
- <order>Spanish</order>
- </collation>
+ <!--collation name="macroman_ci" id="54"/-->
<!--collation name="macroman_ci_ai" id="55"/-->
- <collation name="macroman_cs" id="56">
- <order>Dutch</order>
- <order>English</order>
- <order>French</order>
- <order>German Duden</order>
- <order>Italian</order>
- <order>Latin</order>
- <order>Portuguese</order>
- <order>Spanish</order>
- </collation>
+ <!--collation name="macroman_cs" id="56"/-->
</charset>
<charset name="cp852">
diff --git a/sql/share/charsets/cp1257.xml b/sql/share/charsets/cp1257.xml
index adefac80c8b..bd4489a5a79 100644
--- a/sql/share/charsets/cp1257.xml
+++ b/sql/share/charsets/cp1257.xml
@@ -118,7 +118,7 @@
<collation name="cp1257_bin" flag="binary"/>
-<collation name="cp1257_ci_ai">
+<collation name="cp1257_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/greek.xml b/sql/share/charsets/greek.xml
index 6d8d0954655..defeaf049c8 100644
--- a/sql/share/charsets/greek.xml
+++ b/sql/share/charsets/greek.xml
@@ -97,7 +97,7 @@
</unicode>
-<collation name="greek">
+<collation name="greek_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/hebrew.xml b/sql/share/charsets/hebrew.xml
index fbd4ea0c1d2..ec3fa242ced 100644
--- a/sql/share/charsets/hebrew.xml
+++ b/sql/share/charsets/hebrew.xml
@@ -93,7 +93,7 @@
</unicode>
-<collation name="hebrew">
+<collation name="hebrew_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/keybcs2.xml b/sql/share/charsets/keybcs2.xml
index e509207c1c5..6180dd8550d 100644
--- a/sql/share/charsets/keybcs2.xml
+++ b/sql/share/charsets/keybcs2.xml
@@ -93,7 +93,7 @@
</unicode>
-<collation name="keybcs2">
+<collation name="keybcs2_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/macce.xml b/sql/share/charsets/macce.xml
index 0f39cb14b31..7e955157bb7 100644
--- a/sql/share/charsets/macce.xml
+++ b/sql/share/charsets/macce.xml
@@ -93,7 +93,7 @@
</unicode>
-<collation name="macce">
+<collation name="macce_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/macroman.xml b/sql/share/charsets/macroman.xml
index 8c8a9070084..ffedaa88274 100644
--- a/sql/share/charsets/macroman.xml
+++ b/sql/share/charsets/macroman.xml
@@ -90,7 +90,7 @@
</map>
</unicode>
-<collation name="macroman">
+<collation name="macroman_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
View Lorry Controller Status