diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:34:04 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:34:04 +0300 |
| commit | 6bb8cd842981f3ccdfc08e3cbd0d702fc956c314 (patch) | |
| tree | d30367a92b28d997a8fdc75abf6e00cd78d5ea3c /mysys | |
| parent | af74c3436f5ba44606dc3ffcf501001711ed06d0 (diff) | |
| parent | 9721437edf2037d040fe34dffd87cac1eba30dde (diff) | |
| download | mariadb-git-6bb8cd842981f3ccdfc08e3cbd0d702fc956c314.tar.gz | |
Auto-merge from mysql-trunk.
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 cff7d014148..ff4eb70acd0 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -256,6 +256,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 |