diff options
| author | unknown <kaa@polly.(none)> | 2007-12-01 15:37:25 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-12-01 15:37:25 +0300 |
| commit | a4ba80a8e852fdcf753780dc8e1fbb5df8bb6589 (patch) | |
| tree | c5bb0689e7f8906714f969980b5fa2e18b7cef0d /sql | |
| parent | 509d07bf9486f5b07ed72079ce5edfc235c695c6 (diff) | |
| parent | cf4b8f6aa8f8ae7fabd05e88a35471ef46881262 (diff) | |
| download | mariadb-git-a4ba80a8e852fdcf753780dc8e1fbb5df8bb6589.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/r/insert.result:
Auto merged
mysql-test/t/insert.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'sql')
| -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 1878797297f..a9aca5dc6e0 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5954,7 +5954,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__ /* |