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 | 980e8b413e89175d8fc7f867415712589bead9ff (patch) | |
| tree | 765dbf44bc16c28e3d63a3439bed89b86e4b92fc /mysys | |
| parent | d1dfce06b254548e108deabfe8a7e6b759984d5d (diff) | |
| parent | 376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff) | |
| download | mariadb-git-980e8b413e89175d8fc7f867415712589bead9ff.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 |