diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
| commit | a3073ecd96a829aaff87c6386e0766fc1440922b (patch) | |
| tree | d91e26efc46ab64ee6cb8de880eac060cded0213 /mysys | |
| parent | 1a48919036a7746a15ff6bd19cb52c25fc6a57c1 (diff) | |
| parent | cbd52a42ee9b93675e5cdaa043df878c423b6571 (diff) | |
| download | mariadb-git-a3073ecd96a829aaff87c6386e0766fc1440922b.tar.gz | |
merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset-def.c | 4 | ||||
| -rw-r--r-- | mysys/my_symlink.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index db10000e174..8678852ba5f 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 diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c index 9300c99a6bd..a788424446a 100644 --- a/mysys/my_symlink.c +++ b/mysys/my_symlink.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2010, Oracle and/or its affiliates + Copyright (c) 2001, 2011, Oracle and/or its affiliates 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 |