diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-12 23:42:36 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-12 23:42:36 +0200 |
| commit | de34385a565a07536f314813e02f63aec1d0f369 (patch) | |
| tree | 59d9e31c78caca8be26a8746fa5e83ac54aabb1a /sql/field.cc | |
| parent | 0f6e518a3ba975d84ef192ee295bf330368855b3 (diff) | |
| parent | 3d501aece0f68183d0a74aa37d0938ccd91733ac (diff) | |
| download | mariadb-git-clone-5.0.42-build.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0clone-5.0.42-build
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index b2def4ca8d2..d2e72371bc1 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8426,8 +8426,7 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, case FIELD_TYPE_NULL: break; case FIELD_TYPE_NEWDECIMAL: - if (!fld_length && !decimals) - length= 10; + my_decimal_trim(&length, &decimals); if (length > DECIMAL_MAX_PRECISION) { my_error(ER_TOO_BIG_PRECISION, MYF(0), length, fld_name, |