diff options
author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-27 13:40:35 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-27 13:40:35 +0300 |
commit | 1b93843864c16cc98494c0c805828d142eb5065d (patch) | |
tree | 2443db07ded3aa10caee6e9992b00b054780063c /sql/field.cc | |
parent | 15baa13f84b9880eb9217a3c3b4f19c51bdfaf2d (diff) | |
parent | 0b60184b90cfb7ed1eb927e5106eb194677d43f7 (diff) | |
download | mariadb-git-1b93843864c16cc98494c0c805828d142eb5065d.tar.gz |
Manual merge.
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 973170223e4..a06021bee3d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9685,16 +9685,16 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, else if (tmp_length > PRECISION_FOR_FLOAT) { sql_type= MYSQL_TYPE_DOUBLE; - length= DBL_DIG+7; /* -[digits].E+### */ + length= MAX_DOUBLE_STR_LENGTH; } else - length= FLT_DIG+6; /* -[digits].E+## */ + length= MAX_FLOAT_STR_LENGTH; decimals= NOT_FIXED_DEC; break; } if (!fld_length && !fld_decimals) { - length= FLT_DIG+6; + length= MAX_FLOAT_STR_LENGTH; decimals= NOT_FIXED_DEC; } if (length < decimals && |