mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint sql/field.cc: Auto merged
This commit is contained in:
commit
dfde8826af
1 changed files with 2 additions and 1 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue