diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
| commit | dea3544b2d9bd68961b8e84c3772deda435f15b5 (patch) | |
| tree | d65a66f9f2f9378a1f4ca014e18952ae514f4cb1 /include/m_ctype.h | |
| parent | c72d5e80c53c53a9a847b1c3b6ac66a7ad7eb815 (diff) | |
| parent | ceec7cea338e117d15a9679e517cc2bb24d44fcc (diff) | |
| download | mariadb-git-dea3544b2d9bd68961b8e84c3772deda435f15b5.tar.gz | |
mysql-5.1.62 merge
Diffstat (limited to 'include/m_ctype.h')
| -rw-r--r-- | include/m_ctype.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 216e03bfcac..d6deb485b32 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,6 +50,8 @@ typedef struct unicase_info_st extern MY_UNICASE_INFO *my_unicase_default[256]; extern MY_UNICASE_INFO *my_unicase_turkish[256]; +extern MY_UNICASE_INFO *my_unicase_mysql500[256]; + #define MY_UCA_MAX_CONTRACTION 4 #define MY_UCA_MAX_WEIGHT_SIZE 8 @@ -330,11 +332,13 @@ 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_unicode_ci; +extern CHARSET_INFO my_charset_ucs2_general_mysql500_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_utf8_general_mysql500_ci; extern CHARSET_INFO my_charset_cp1250_czech_ci; extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_filename; |