diff options
| author | unknown <kaa@polly.(none)> | 2007-12-01 15:30:01 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-12-01 15:30:01 +0300 |
| commit | 813fc2b9cf041d63c0bbc8aa924f8f9e7616517c (patch) | |
| tree | 828386281618ae42efa78c7ab135915a5b6de8ce /sql/field.cc | |
| parent | 9562db68554078b41f2623342cf901eeee07711a (diff) | |
| parent | 1f22720c3f6bf28a44ee0e3a9a9abd52e9debe64 (diff) | |
| download | mariadb-git-813fc2b9cf041d63c0bbc8aa924f8f9e7616517c.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
mysql-test/r/insert.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/insert.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 00c12ad7d5b..9e57e27394e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6306,7 +6306,7 @@ int Field_str::store(double nr) if (exp >= (int) digits || exp < -4) digits= max(0, (int) (max_length - 5 - (exp >= 100 || exp <= -100))); - length= (uint) my_sprintf(buff, (buff, "%-.*g", digits, nr)); + length= (uint) my_sprintf(buff, (buff, "%-.*g", min(digits, DBL_DIG ), nr)); #ifdef __WIN__ /* |