diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-18 12:02:39 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-18 12:02:39 +0200 |
| commit | ca9b245b3ef5d09fedc0520a70f146f2806ef3a4 (patch) | |
| tree | eacee7e8008304bf70a46b4e8480ad61dc4c06d9 /include | |
| parent | 5004acef85b3ebdcff0116278bc9a1f0107bbde5 (diff) | |
| parent | dc69073e148cf54c2e3ee7ed3b6c2f50cc3ae391 (diff) | |
| download | mariadb-git-ca9b245b3ef5d09fedc0520a70f146f2806ef3a4.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index f33fd015733..9f21ac16a05 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -281,10 +281,11 @@ extern CHARSET_INFO my_charset_tis620_thai_ci; extern CHARSET_INFO my_charset_tis620_bin; extern CHARSET_INFO my_charset_ucs2_general_ci; extern CHARSET_INFO my_charset_ucs2_bin; -extern CHARSET_INFO my_charset_ucs2_general_uca; +extern CHARSET_INFO my_charset_ucs2_unicode_ci; extern CHARSET_INFO my_charset_ujis_japanese_ci; extern CHARSET_INFO my_charset_ujis_bin; extern CHARSET_INFO my_charset_utf8_general_ci; +extern CHARSET_INFO my_charset_utf8_unicode_ci; extern CHARSET_INFO my_charset_utf8_bin; extern CHARSET_INFO my_charset_cp1250_czech_ci; |