diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-23 13:23:50 +0400 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2012-01-23 13:23:50 +0400 |
| commit | 31a1f8ef54e4e84cce25d192305d56bcdf8c87d0 (patch) | |
| tree | 55a46bd596bfdbfb3adc641f4fc3b175041ae6e0 /mysys/charset-def.c | |
| parent | 9cb16ec55beecef400dc972965c90a34bc3fc3c0 (diff) | |
| parent | e449cf48afc34705b601113fd73bce84338c2e37 (diff) | |
| download | mariadb-git-31a1f8ef54e4e84cce25d192305d56bcdf8c87d0.tar.gz | |
Merging Bug#11752408 from mysql-5.1
Diffstat (limited to 'mysys/charset-def.c')
| -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 2cff57be4b4..2a1ced1c2ac 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -204,6 +204,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); @@ -236,6 +237,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 |