From 0912871d6aeefe61dae1370ab9a1493341b9b4fc Mon Sep 17 00:00:00 2001
From: unknown <bar@bar.mysql.r18.ru>
Date: Fri, 20 Jun 2003 19:05:45 +0500
Subject: [PATCH] item_cmpfunc.cc:   Temporarily fix for test failure   ,.

sql/item_cmpfunc.cc:
  Temporarily fix for test failure
  ,.
---
 sql/item_cmpfunc.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index e67c742928e..5c2b9ed4682 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -90,6 +90,13 @@ static bool convert_constant_item(Field *field, Item **item)
 bool Item_bool_func2::set_cmp_charset(CHARSET_INFO *cs1, enum coercion co1,
 				      CHARSET_INFO *cs2, enum coercion co2)
 {
+  if (cs1 == &my_charset_bin || cs2 == &my_charset_bin)
+  {
+    cmp_charset= &my_charset_bin;
+    coercibility= co1 > co2 ? co1 : co2;
+    return 0;
+  }
+
   if (!my_charset_same(cs1, cs2))
   {
     /*