diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-25 18:37:28 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-25 18:37:28 +0300 |
| commit | 21b954bc9dc776c3d2af92f858b6f726bbe2202e (patch) | |
| tree | 1328afc6e2b10d48dd499927063824ec875201a9 /sql/field.cc | |
| parent | dd04dc761c4d090caef545d78f0dc6df97c062f9 (diff) | |
| parent | e619a0ae239d0cc7e16a572b1fc89225424f74da (diff) | |
| download | mariadb-git-21b954bc9dc776c3d2af92f858b6f726bbe2202e.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index dbdd44633f0..5dd9886f82c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4300,8 +4300,9 @@ int Field_str::store(double nr) uint length; bool use_scientific_notation= TRUE; use_scientific_notation= TRUE; -if (field_length < 32 && fabs(nr) < log_10[field_length]-1) + if (field_length < 32 && fabs(nr) < log_10[field_length]-1) use_scientific_notation= FALSE; + length= (uint) my_sprintf(buff, (buff, "%-.*g", (use_scientific_notation ? max(0, (int)field_length-5) : |