diff options
author | kaa@polly.(none) <> | 2007-12-02 14:11:36 +0300 |
---|---|---|
committer | kaa@polly.(none) <> | 2007-12-02 14:11:36 +0300 |
commit | 0e78354baa5ed83f115b6f96e21b31fe0b1e4cbc (patch) | |
tree | 3f6cb6e2f35783d5a800baeb6e12183f6abb1132 /sql | |
parent | 2a52bb82e49c80d915a4c995b055293fa427e9b2 (diff) | |
parent | d905aade4f5ef4c15321d57fff31f45d2952498e (diff) | |
download | mariadb-git-0e78354baa5ed83f115b6f96e21b31fe0b1e4cbc.tar.gz |
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
Diffstat (limited to 'sql')
-rw-r--r-- | sql/field.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index a9aca5dc6e0..31d2af1bb14 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5953,8 +5953,11 @@ int Field_str::store(double nr) */ if (exp >= (int) digits || exp < -4) digits= max(0, (int) (max_length - 5 - (exp >= 100 || exp <= -100))); + + /* Limit precision to DBL_DIG to avoid garbage past significant digits */ + set_if_smaller(digits, DBL_DIG); - length= (uint) my_sprintf(buff, (buff, "%-.*g", min(digits, DBL_DIG ), nr)); + length= (uint) my_sprintf(buff, (buff, "%-.*g", digits, nr)); #ifdef __WIN__ /* |