1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

item.cc:

Browse Source 
After review fix
This commit is contained in:
bar@mysql.com 2005-08-08 16:20:46 +05:00
parent 1b40adcb06
commit 2c8fc886b9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/item.cc
View File

@ -455,16 +455,18 @@ bool DTCollation::aggregate(DTCollation &dt, uint flags)
; // Do nothing ; // Do nothing
} }
else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) && else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
derivation <= dt.derivation &&
collation->state & MY_CS_UNICODE && collation->state & MY_CS_UNICODE &&
!(dt.collation->state & MY_CS_UNICODE)) (derivation < dt.derivation ||
(derivation == dt.derivation &&
!(dt.collation->state & MY_CS_UNICODE))))
{ {
// Do nothing // Do nothing
} }
else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) && else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
dt.derivation <= derivation &&
dt.collation->state & MY_CS_UNICODE && dt.collation->state & MY_CS_UNICODE &&
!(collation->state & MY_CS_UNICODE)) (dt.derivation < derivation ||
(dt.derivation == derivation &&
!(collation->state & MY_CS_UNICODE))))
{ {
set(dt); set(dt);
} }