Skip to content

M
MariaDB
Commit 7ad9f7c4 authored by unknown's avatar unknown
Browse files
Options

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
parents 094d141b 48572f03
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
sql/share/charsets/Index.xml
View file @ 7ad9f7c4
...@@ -58,7 +58,7 @@ To make maintaining easier please: ...@@ -58,7 +58,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
</charset> </charset>
...@@ -76,7 +76,7 @@ To make maintaining easier please: ...@@ -76,7 +76,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
<collation name="cp850_bin" id="80" order="Binary" flag="binary"/> <collation name="cp850_bin" id="80" order="Binary" flag="binary"/>
...@@ -104,7 +104,7 @@ To make maintaining easier please: ...@@ -104,7 +104,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
<collation name="latin1_general_cs" id="49"> <collation name="latin1_general_cs" id="49">
...@@ -114,7 +114,7 @@ To make maintaining easier please: ...@@ -114,7 +114,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
</charset> </charset>
...@@ -131,7 +131,7 @@ To make maintaining easier please: ...@@ -131,7 +131,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
</charset> </charset>
...@@ -451,7 +451,7 @@ To make maintaining easier please: ...@@ -451,7 +451,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
<collation name="macroman_bin" id="53" order="Binary" flag="binary"/> <collation name="macroman_bin" id="53" order="Binary" flag="binary"/>
...@@ -462,7 +462,7 @@ To make maintaining easier please: ...@@ -462,7 +462,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
<!--collation name="macroman_ci_ai" id="55"/--> <!--collation name="macroman_ci_ai" id="55"/-->
...@@ -473,7 +473,7 @@ To make maintaining easier please: ...@@ -473,7 +473,7 @@ To make maintaining easier please:
<order>German Duden</order> <order>German Duden</order>
<order>Italian</order> <order>Italian</order>
<order>Latin</order> <order>Latin</order>
<order>Pogtuguese</order> <order>Portuguese</order>
<order>Spanish</order> <order>Spanish</order>
</collation> </collation>
</charset> </charset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7