diff options
| author | unknown <kaa@polly.(none)> | 2007-12-02 13:51:39 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-12-02 13:51:39 +0300 |
| commit | c1eb6f1eacccf52ea9538e28c07f1bdea625a97c (patch) | |
| tree | 56592b4fdc8ba1a667ebfeb9bb2d3a45331b3351 /sql | |
| parent | 813fc2b9cf041d63c0bbc8aa924f8f9e7616517c (diff) | |
| parent | 5fd87abaa81c80cbcc4526bf6424e7ae24362fbd (diff) | |
| download | mariadb-git-c1eb6f1eacccf52ea9538e28c07f1bdea625a97c.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
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 9e57e27394e..10ef5e0cf16 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6305,8 +6305,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__ /* |