diff options
| author | unknown <mskold@mysql.com> | 2005-01-13 10:49:01 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-01-13 10:49:01 +0100 |
| commit | 6cacf67b90bdace849ccf25e48392867ca672e0a (patch) | |
| tree | 947ccdddaea0b34f06538eb9b0da2620d2d9d58b /sql/share/charsets/Index.xml | |
| parent | 48a98eb1239261f3b6d8a5792410d453d32a54b8 (diff) | |
| parent | 12040a9deaf8fc47f448123ab2e24c8f10f39e03 (diff) | |
| download | mariadb-git-6cacf67b90bdace849ccf25e48392867ca672e0a.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/share/charsets/Index.xml')
| -rw-r--r-- | sql/share/charsets/Index.xml | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 9595d4a7ddb..3c35ec98a92 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding="utf-8"?> -<charsets max-id="94"> +<charsets max-id="98"> <copyright> Copyright (C) 2003 MySQL AB @@ -553,5 +553,38 @@ To make maintaining easier please: </collation> </charset> +<charset name="cp932"> + <family>Japanese</family> + <description>SJIS for Windows Japanese</description> + <alias>ms_cp932</alias> + <alias>sjis_cp932</alias> + <alias>sjis_ms</alias> + <collation name="cp932_japanese_ci" id="95" order="Japanese"> + <flag>primary</flag> + <flag>compiled</flag> + </collation> + <collation name="cp932_bin" id="96" order="Binary"> + <flag>binary</flag> + <flag>compiled</flag> + </collation> +</charset> + +<charset name="eucjpms"> + <family>Japanese</family> + <description>UJIS for Windows Japanese</description> + <alias>eucjpms</alias> + <alias>eucJP_ms</alias> + <alias>ujis_ms</alias> + <alias>ujis_cp932</alias> + <collation name="eucjpms_japanese_ci" id="97" order="Japanese"> + <flag>primary</flag> + <flag>compiled</flag> + </collation> + <collation name="eucjpms_bin" id="98" order="Japanese"> + <flag>binary</flag> + <flag>compiled</flag> + </collation> +</charset> + </charsets> |