item.cc:

After review fix

item.cc:
After review fix
2c8fc886 · bar@mysql.com · 1b40adcb · 2c8fc886
Commit 2c8fc886 authored Aug 08, 2005 by bar@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

sql/item.cc sql/item.cc +6 -4

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -455,16 +455,18 @@ bool DTCollation::aggregate(DTCollation &dt, uint flags)
       ; // Do nothing
    }
    else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
-             derivation <= dt.derivation &&
             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
    }
    else if ((flags & MY_COLL_ALLOW_SUPERSET_CONV) &&
-             dt.derivation <= derivation &&
             dt.collation->state & MY_CS_UNICODE &&
-             !(collation->state & MY_CS_UNICODE))
+             (dt.derivation < derivation ||
+              (dt.derivation == derivation &&
+             !(collation->state & MY_CS_UNICODE))))
    {
      set(dt);
    }