diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
| commit | d4b30a7a84742ae03774fe25af2cbad144ba2d5d (patch) | |
| tree | d65a66f9f2f9378a1f4ca014e18952ae514f4cb1 /mysys/charset-def.c | |
| parent | d993ce1bbf8413a0aaf5a524a11334359234c5f4 (diff) | |
| parent | cea2c5d28ead6ae4191aea164df9b80b41a743ad (diff) | |
| download | mariadb-git-mariadb-5.1.62.tar.gz | |
mysql-5.1.62 mergemariadb-5.1.62
Diffstat (limited to 'mysys/charset-def.c')
| -rw-r--r-- | mysys/charset-def.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index 5c68258ada1..b9107e42f5c 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -134,6 +134,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); @@ -166,6 +167,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 |