Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

sql/opt_range.cc

@@ -1028,7 +1028,7 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
       field->cmp_type() != value->result_type())
     DBUG_RETURN(0);
 
-  if (value->save_in_field(field) == 1)
+  if (value->save_in_field(field) > 0)
   {
     if (type == Item_func::EQUAL_FUNC)
     {

sql/sql_base.cc

@@ -2113,7 +2113,7 @@ fill_record(List<Item> &fields,List<Item> &values)
   while ((field=(Item_field*) f++))
   {
     value=v++;
-    if (value->save_in_field(field->field) == 1)
+    if (value->save_in_field(field->field) > 0)
       DBUG_RETURN(1);
   }
   DBUG_RETURN(0);