diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-22 16:28:51 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-22 16:28:51 +0300 |
| commit | 074583a730d62d616061f06e810c0dfdf4aeddcc (patch) | |
| tree | 1fef9d45dab47fa4d783abace538a791c958b006 /mysys/charset.c | |
| parent | 5d407d0c1aa8a7cb5f18a5a26cb517f8b4eb84fa (diff) | |
| parent | a35418784bc35f5b6c461689c954bdcfbb4c9b33 (diff) | |
| download | mariadb-git-074583a730d62d616061f06e810c0dfdf4aeddcc.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in sql/item_func.cc
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index ba78838b298..ab89a259481 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -245,6 +245,8 @@ static int add_collation(CHARSET_INFO *cs) if (cs_copy_data(all_charsets[cs->number],cs)) return MY_XML_ERROR; + newcs->caseup_multiply= newcs->casedn_multiply= 1; + if (!strcmp(cs->csname,"ucs2") ) { #if defined(HAVE_CHARSET_ucs2) && defined(HAVE_UCA_COLLATIONS) |