diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:33:54 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-16 11:33:54 +0300 |
| commit | 13348d3769735c4ed23df263e9c00e42d7a08aca (patch) | |
| tree | 765dbf44bc16c28e3d63a3439bed89b86e4b92fc /mysys | |
| parent | 58b24720b65ff817f5dd587922eb678a8473895a (diff) | |
| parent | bd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff) | |
| download | mariadb-git-13348d3769735c4ed23df263e9c00e42d7a08aca.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'mysys')
| -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 280b2ad6091..e216f665092 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 |