diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-18 12:10:36 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-18 12:10:36 +0200 |
| commit | 6da3c0facc5dea87c4a2dbb90cac4305ccdad74c (patch) | |
| tree | fa35400ab393c7b0d559a0ed371af7d334a77627 /include | |
| parent | 1140898b32f91ccee38585ccb3b026455c41943c (diff) | |
| parent | f9c8d1dd7fbf4c0d55a135fdda7f40c970af1a19 (diff) | |
| download | mariadb-git-6da3c0facc5dea87c4a2dbb90cac4305ccdad74c.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_insert.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
sql/share/errmsg.txt:
SCCS 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 e5debc6e032..cc6a3a4fb4e 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -296,10 +296,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; extern CHARSET_INFO my_charset_filename; |