diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-06-18 09:33:43 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-06-18 09:33:43 +0200 |
| commit | caf55fffef061f188e28e341ab6670b37b0a0b60 (patch) | |
| tree | 01e470eac45e9325cdc5c02207f412ab4bfdd562 /include | |
| parent | fe99cf3ac053acec8a82e939367d7c082d5b90f9 (diff) | |
| parent | 0f47919597c2680570eabc30624a60a1a3d3335e (diff) | |
| download | mariadb-git-caf55fffef061f188e28e341ab6670b37b0a0b60.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
mysql-test/t/innodb.test:
Auto merged
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; |