diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
| commit | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (patch) | |
| tree | 650133297bec368a1cdeb50ea1950e1b4d1b679e /include | |
| parent | b43494620f6cd57e8249940f4fb0406ffff8dff7 (diff) | |
| parent | b95ae56b9f47cc19d3498d4be3142b2449a04600 (diff) | |
| download | mariadb-git-f860b2aad41cd1b5ed0438ea211dcd78eec82b94.tar.gz | |
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 37e15894432..969cb0058ac 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -71,7 +71,7 @@ struct unicase_info_st extern MY_UNICASE_INFO *const my_unicase_default[256]; extern MY_UNICASE_INFO *const my_unicase_turkish[256]; -extern MY_UNICASE_INFO *my_unicase_mysql500[256]; +extern MY_UNICASE_INFO *const my_unicase_mysql500[256]; #define MY_UCA_MAX_CONTRACTION 4 #define MY_UCA_MAX_WEIGHT_SIZE 8 @@ -356,6 +356,7 @@ extern struct charset_info_st my_charset_ucs2_bin; extern struct charset_info_st my_charset_ucs2_general_ci; extern struct charset_info_st my_charset_ucs2_general_mysql500_ci; extern struct charset_info_st my_charset_ucs2_unicode_ci; +extern struct charset_info_st my_charset_ucs2_general_mysql500_ci; extern struct charset_info_st my_charset_ujis_bin; extern struct charset_info_st my_charset_ujis_japanese_ci; extern struct charset_info_st my_charset_utf16_bin; |