diff options
| author | unknown <chuck.bell@oracle.com> | 2012-01-30 10:23:21 -0500 |
|---|---|---|
| committer | unknown <chuck.bell@oracle.com> | 2012-01-30 10:23:21 -0500 |
| commit | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (patch) | |
| tree | 9a7f9e1c893fd7ee514374eec7e411810d5f2151 /mysys/charset-def.c | |
| parent | 461e039a07062f05082175edb1156725ac43b4c6 (diff) | |
| parent | 40bab62acff37c947e5d57203235ac0a6afc5f31 (diff) | |
| download | mariadb-git-7009bf411a8cb9a6e035b761b5e6352b4f474303.tar.gz | |
Merge with main for BUG#12969301
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 |