diff options
| author | unknown <ramil@mysql.com> | 2005-05-06 20:11:01 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-05-06 20:11:01 +0500 |
| commit | 9c3a41f388a5ba5a888f6d02786587e347504e79 (patch) | |
| tree | 3f5c6188e83b97f02df0b73b6693bd3c4fb534e6 /sql/share/charsets/Index.xml | |
| parent | f1def25a89e3dc2ed191335e9d5f7843de245e0a (diff) | |
| parent | a67043dbd812c2cf4da0950d1b12bf91ee3af14d (diff) | |
| download | mariadb-git-9c3a41f388a5ba5a888f6d02786587e347504e79.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-4.1
into mysql.com:/home/ram/work/mysql-5.0
include/my_global.h:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
sql/share/charsets/Index.xml:
Auto merged
Diffstat (limited to 'sql/share/charsets/Index.xml')
| -rw-r--r-- | sql/share/charsets/Index.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 3c35ec98a92..a6bb4bad99b 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -367,6 +367,9 @@ To make maintaining easier please: <order>Slovenian</order> <order>Sorbian</order> </collation> + <collation name="cp1250_croatian_ci" id="44"> + <order>Croatian</order> + </collation> <collation name="cp1250_czech_cs" id="34" order="Czech"> <flag>compiled</flag> </collation> |