Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge

1 files changed, 8 insertions, 3 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 11a9e88bdd6..b6b99a9f717 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -667,10 +667,10 @@ void Item_param::set_double(double value)
 }
 
 
-void Item_param::set_value(const char *str, uint length)
+void Item_param::set_value(const char *str, uint length, CHARSET_INFO *ci)
 {
   DBUG_ENTER("Item_param::set_value");
-  str_value.copy(str,length,default_charset());
+  str_value.copy(str,length,ci);
   item_type= STRING_ITEM;
   value_is_set= 1;
   maybe_null= 0;
@@ -678,6 +678,11 @@ void Item_param::set_value(const char *str, uint length)
   DBUG_VOID_RETURN;
 }
 
+void Item_param::set_value(const char *str, uint length)
+{
+  set_value(str, length, default_charset());
+}
+
 
 void Item_param::set_time(TIME *tm, timestamp_type type)
 { 
@@ -1558,7 +1563,7 @@ bool Item::send(Protocol *protocol, String *buffer)
   }
   case MYSQL_TYPE_TINY:
   {
-    longlong nr;
+    longlong nr;  
     nr= val_int();
     if (!null_value)
       result= protocol->store_tiny(nr);