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 /mysys | |
| 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 'mysys')
| -rw-r--r-- | mysys/charset-def.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index 63bbceef29b..8adef3eb72e 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -132,6 +132,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) #ifdef HAVE_CHARSET_ucs2 add_compiled_collation(&my_charset_ucs2_general_ci); add_compiled_collation(&my_charset_ucs2_bin); + add_compiled_collation(&my_charset_ucs2_general_mysql500_ci); #ifdef HAVE_UCA_COLLATIONS add_compiled_collation(&my_charset_ucs2_unicode_ci); add_compiled_collation(&my_charset_ucs2_icelandic_uca_ci); @@ -163,6 +164,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) #ifdef HAVE_CHARSET_utf8 add_compiled_collation(&my_charset_utf8_general_ci); add_compiled_collation(&my_charset_utf8_bin); + add_compiled_collation(&my_charset_utf8_general_mysql500_ci); #ifdef HAVE_UTF8_GENERAL_CS add_compiled_collation(&my_charset_utf8_general_cs); #endif |