diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-02-24 13:15:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-02-24 13:15:34 +0400 |
| commit | 13c32771e7e46573c3e39973f5af20cb9560867a (patch) | |
| tree | 469ee723904a6610a4436b55056ed5e2c19d9972 /sql/item.cc | |
| parent | b5936f7340ffe26e2f1b3a1c98c647f88b16940e (diff) | |
| download | mariadb-git-13c32771e7e46573c3e39973f5af20cb9560867a.tar.gz | |
Backporting WL#1213
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index e785f0addde..e9ac44eeba8 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -854,7 +854,7 @@ Item *Item_param::safe_charset_converter(CHARSET_INFO *tocs) cnvitem->max_length= cnvitem->str_value.numchars() * tocs->mbmaxlen; return cnvitem; } - return NULL; + return Item::safe_charset_converter(tocs); } @@ -1436,7 +1436,12 @@ left_is_superset(DTCollation *left, DTCollation *right) if (left->collation->state & MY_CS_UNICODE && (left->derivation < right->derivation || (left->derivation == right->derivation && - !(right->collation->state & MY_CS_UNICODE)))) + (!(right->collation->state & MY_CS_UNICODE) || + /* The code below makes 4-byte utf8 a superset over 3-byte utf8 */ + (left->collation->state & MY_CS_UNICODE_SUPPLEMENT && + !(right->collation->state & MY_CS_UNICODE_SUPPLEMENT) && + left->collation->mbmaxlen > right->collation->mbmaxlen && + left->collation->mbminlen == right->collation->mbminlen))))) return TRUE; /* Allow convert from ASCII */ if (right->repertoire == MY_REPERTOIRE_ASCII && @@ -1695,7 +1700,7 @@ bool agg_item_set_converter(DTCollation &coll, const char *fname, { Item* conv; uint32 dummy_offset; - if (!String::needs_conversion(0, (*arg)->collation.collation, + if (!String::needs_conversion(1, (*arg)->collation.collation, coll.collation, &dummy_offset)) continue; |