diff options
| author | unknown <kaa@polly.(none)> | 2007-12-02 14:11:36 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-12-02 14:11:36 +0300 |
| commit | 7980537c9363b291cac142454140d9e5e0c3e23e (patch) | |
| tree | 3f6cb6e2f35783d5a800baeb6e12183f6abb1132 /sql | |
| parent | a4ba80a8e852fdcf753780dc8e1fbb5df8bb6589 (diff) | |
| parent | f7bd0808918d48a581dedec489411a0c195d5e70 (diff) | |
| download | mariadb-git-7980537c9363b291cac142454140d9e5e0c3e23e.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
mysql-test/t/insert.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
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__ /* |