From 2c8fc886b91903d0cbb9064c64c7209ee816369e Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Mon, 8 Aug 2005 16:20:46 +0500
Subject: [PATCH] item.cc:   After review fix

---
 sql/item.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sql/item.cc b/sql/item.cc
index 41cda365750..b3d2932acf6 100644
--- 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);
     }