mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

take dec. point into account in store_double_in_string

Browse source
This commit is contained in:
serg@serg.mylan 2004-08-19 11:21:08 +02:00
parent 754fafd28f
commit 8ef3cdc2f9
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sql/field.cc
View file

@ -3716,7 +3716,7 @@ static void store_double_in_string_field(Field_str *field, uint32 field_length,
{ {
bool use_scientific_notation=TRUE; bool use_scientific_notation=TRUE;
char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE]; char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
int length; uint length;
if (field_length < 32 && nr > 1) if (field_length < 32 && nr > 1)
{ {
if (field->ceiling == 0) if (field->ceiling == 0)
@ -3732,11 +3732,17 @@ static void store_double_in_string_field(Field_str *field, uint32 field_length,
} }
use_scientific_notation= (field->ceiling < nr); use_scientific_notation= (field->ceiling < nr);
} }
length= sprintf(buff, "%-.*g", length= (uint)sprintf(buff, "%-.*g",
use_scientific_notation ? max(0,field_length-5) : field_length, use_scientific_notation ? max(0,field_length-5) : field_length,
nr); nr);
DBUG_ASSERT(length <= field_length); /*
field->store(buff, (uint) length); +1 below is because "precision" in %g above means the
max. number of significant digits, not the output width.
Thus the width can be larger than number of significant digits by 1
(for decimal point)
*/
DBUG_ASSERT(length <= field_length+1);
field->store(buff, min(length, field_length));
} }
void Field_string::store(double nr) void Field_string::store(double nr)