Commit 8946f1ea authored by bar@bar.mysql.r18.ru's avatar bar@bar.mysql.r18.ru

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

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
parents 3a00dc73 da502429
......@@ -58,7 +58,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......@@ -76,7 +76,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<collation name="cp850_bin" id="80" order="Binary" flag="binary"/>
......@@ -104,7 +104,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<collation name="latin1_general_cs" id="49">
......@@ -114,7 +114,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......@@ -131,7 +131,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</charset>
......@@ -451,7 +451,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<collation name="macroman_bin" id="53" order="Binary" flag="binary"/>
......@@ -462,7 +462,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
<!--collation name="macroman_ci_ai" id="55"/-->
......@@ -473,7 +473,7 @@ To make maintaining easier please:
<order>German Duden</order>
<order>Italian</order>
<order>Latin</order>
<order>Pogtuguese</order>
<order>Portuguese</order>
<order>Spanish</order>
</collation>
</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