Commit d54359ff authored by unknown's avatar unknown
Browse files

Addition to fix for bug #12956: cast make differ rounding. 

- use rint() in some other val_int() methods as well.
parent 6cc4218f

sql/field.cc

+2 −2
Original line number Diff line number Diff line
@@ -3953,7 +3953,7 @@ longlong Field_float::val_int(void) 
  else

#endif

    memcpy_fixed((byte*) &j,ptr,sizeof(j));

  return ((longlong) j);

  return (longlong) rint(j);

}
@@ -4241,7 +4241,7 @@ longlong Field_double::val_int(void) 
  else

#endif

    doubleget(j,ptr);

  return ((longlong) j);

  return (longlong) rint(j);

}

sql/item.h

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ struct Hybrid_type_traits 
  { val->real/= ulonglong2double(u); }



  virtual longlong val_int(Hybrid_type *val, bool unsigned_flag) const

  { return (longlong) val->real; }

  { return (longlong) rint(val->real); }

  virtual double val_real(Hybrid_type *val) const { return val->real; }

  virtual my_decimal *val_decimal(Hybrid_type *val, my_decimal *buf) const;

  virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const;
@@ -1341,7 +1341,7 @@ class Item_float :public Item_num 
    {

      return LONGLONG_MAX;

    }

    return (longlong) (value+(value > 0 ? 0.5 : -0.5));

    return (longlong) rint(value);

  }

  String *val_str(String*);

  my_decimal *val_decimal(my_decimal *);