Commit d4b4952f authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/B22344-5.0-opt
parents 762aa1c0 79c51f21

sql/item.cc

+1 −12
Original line number Diff line number Diff line
@@ -5277,18 +5277,7 @@ my_decimal *Item_ref::val_decimal(my_decimal *decimal_value) 
int Item_ref::save_in_field(Field *to, bool no_conversions)

{

  int res;

  if (result_field)

  {

    if (result_field->is_null())

    {

      null_value= 1;

      return set_field_to_null_with_conversions(to, no_conversions);

    }

    to->set_notnull();

    res= field_conv(to, result_field);

    null_value= 0;

    return res;

  }

  DBUG_ASSERT(!result_field);

  res= (*ref)->save_in_field(to, no_conversions);

  null_value= (*ref)->null_value;

  return res;