diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-23 13:07:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-23 13:07:10 +0400 |
| commit | e449cf48afc34705b601113fd73bce84338c2e37 (patch) | |
| tree | cf43eee040addc69dd90ca98e9ee802def2aa167 /include | |
| parent | 2bffb8b1de54e74fee8d0cc72d58b08129d6c442 (diff) | |
| download | mariadb-git-e449cf48afc34705b601113fd73bce84338c2e37.tar.gz | |
Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8_GENERAL_CI
Introducing new collations:
utf8_general_mysql500_ci and ucs2_general_mysql500_ci,
to reproduce behaviour of utf8_general_ci and ucs2_general_ci
from mysql-5.1.23 (and earlier).
The collations are added to simplify upgrade from mysql-5.1.23 and earlier.
Note: The patch does not make new server start over old data automatically.
Some manual upgrade procedures are assumed.
Paul: please get in touch with me to discuss upgrade procedures
when documenting this bug.
modified:
include/m_ctype.h
mysql-test/r/ctype_utf8.result
mysql-test/t/ctype_utf8.test
mysys/charset-def.c
strings/ctype-ucs2.c
strings/ctype-utf8.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 3b836dfbaf3..f8d654f387e 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -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]; + typedef struct uni_ctype_st { @@ -311,11 +313,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; |