Commit 0f0051e6 authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
parents b994abb9 33125cd4

sql/field.cc

+2 −1
Original line number Diff line number Diff line
@@ -5909,6 +5909,7 @@ int Field_str::store(double nr) 
  uint length;

  uint local_char_length= field_length / charset()->mbmaxlen;

  double anr= fabs(nr);

  bool fractional= (anr != floor(anr));

  int neg= (nr < 0.0) ? 1 : 0;

  uint max_length;

  int exp;
@@ -5937,7 +5938,7 @@ int Field_str::store(double nr) 
    calculate the maximum number of significant digits if the 'f'-format

    would be used (+1 for decimal point if the number has a fractional part).

  */

  digits= max(0, (int) max_length - (nr != trunc(nr)));

  digits= max(0, (int) max_length - fractional);

  /*

    If the exponent is negative, decrease digits by the number of leading zeros

    after the decimal point that do not count as significant digits.