diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-12-11 01:58:13 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-12-11 01:58:13 -0700 |
| commit | bea4ab9bb65f6ff576b9b71011c5a8f22baa164a (patch) | |
| tree | 5d91d6cc01f82639588f2c17fbb5289637567684 /mysys/charset.c | |
| parent | c082955f0676efe069f30384102ba7807b49dee6 (diff) | |
| parent | 376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff) | |
| download | mariadb-git-bea4ab9bb65f6ff576b9b71011c5a8f22baa164a.tar.gz | |
Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 3f3f62a0ae1..f05e8c71297 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -255,6 +255,9 @@ static int add_collation(CHARSET_INFO *cs) { #if defined (HAVE_CHARSET_utf8) && defined(HAVE_UCA_COLLATIONS) copy_uca_collation(newcs, &my_charset_utf8_unicode_ci); + newcs->ctype= my_charset_utf8_unicode_ci.ctype; + if (init_state_maps(newcs)) + return MY_XML_ERROR; #endif } else |