diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-23 20:25:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-23 20:25:52 +0400 |
| commit | 426d246f5b8a4c598a913838b625e05e63ccb41f (patch) | |
| tree | 16792dd3268c0ec0fb02837c761a535af1938b1f /mysys/charset.c | |
| parent | de8e306b6921ab32aedde957594e570166a7fce1 (diff) | |
| download | mariadb-git-426d246f5b8a4c598a913838b625e05e63ccb41f.tar.gz | |
MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 0fea3c4c1cf..f9d1286088d 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -251,7 +251,8 @@ static int add_collation(struct charset_info_st *cs) return MY_XML_ERROR; newcs->caseup_multiply= newcs->casedn_multiply= 1; - + newcs->levels_for_order= 1; + if (!strcmp(cs->csname,"ucs2") ) { #if defined(HAVE_CHARSET_ucs2) && defined(HAVE_UCA_COLLATIONS) @@ -296,6 +297,7 @@ static int add_collation(struct charset_info_st *cs) simple_cs_init_functions(newcs); newcs->mbminlen= 1; newcs->mbmaxlen= 1; + newcs->strxfrm_multiply= 1; if (simple_cs_is_full(newcs)) { newcs->state |= MY_CS_LOADED; |