From ce17ac5af299e040499b355e30b3fcdacdf02712 Mon Sep 17 00:00:00 2001
From: unknown <bar@bar.mysql.r18.ru>
Date: Fri, 21 Mar 2003 18:31:41 +0400
Subject: [PATCH] IF() and LEAST() now honors coercibility

---
 sql/item_cmpfunc.cc |  9 +++++++--
 sql/item_func.cc    | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index ff6f4022877..e63f0a836de 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -723,8 +723,12 @@ Item_func_if::fix_length_and_dec()
   else if (arg1_type == STRING_RESULT || arg2_type == STRING_RESULT)
   {
     cached_result_type = STRING_RESULT;
-    set_charset((args[1]->binary() || args[2]->binary()) ? 
-		&my_charset_bin : args[1]->charset());
+    if (set_charset(args[1]->charset(), args[1]->coercibility,
+		args[2]->charset(), args[2]->coercibility))
+    {
+      my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name());
+      return;
+    }
   }
   else
   {
@@ -760,6 +764,7 @@ Item_func_if::val_str(String *str)
 {
   Item *arg= args[0]->val_int() ? args[1] : args[2];
   String *res=arg->val_str(str);
+  res->set_charset(charset());
   null_value=arg->null_value;
   return res;
 }
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 72db23d1953..5bbb6003e4f 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -855,9 +855,13 @@ void Item_func_min_max::fix_length_and_dec()
       maybe_null=0;
     cmp_type=item_cmp_type(cmp_type,args[i]->result_type());
     if (i==0)
-      set_charset(args[i]->charset());
-    else if (args[i]->charset() == &my_charset_bin)
-      set_charset(&my_charset_bin);
+      set_charset(args[i]->charset(), args[i]->coercibility);
+    else if (set_charset(charset(), coercibility, 
+			args[i]->charset(), args[i]->coercibility))
+    {
+      my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name());
+      break;
+    }
   }
 }
 
@@ -909,6 +913,7 @@ String *Item_func_min_max::val_str(String *str)
 	}
       }
     }
+    res->set_charset(charset());
     return res;
   }
   case ROW_RESULT: