diff options
| author | unknown <hf@deer.(none)> | 2005-10-25 21:09:37 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-10-25 21:09:37 +0500 |
| commit | 57982bcc5609b8040b578b492ba675bdbc04da36 (patch) | |
| tree | 4102ae399ecc43ca9a05af1b8b8df9eebe6c493b /sql/sql_parse.cc | |
| parent | 821107cfd14aefd7711d88e1188a604c04eb3059 (diff) | |
| parent | d30081732a65d91876d92bdd54c8dfa5c1c7a793 (diff) | |
| download | mariadb-git-57982bcc5609b8040b578b492ba675bdbc04da36.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-5.0.13667
into deer.(none):/home/hf/work/mysql-5.0.12267
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index d0585dd1a65..33020fccd8e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5791,7 +5791,7 @@ new_create_field(THD *thd, char *field_name, enum_field_types type, case FIELD_TYPE_NULL: break; case FIELD_TYPE_NEWDECIMAL: - if (!length) + if (!length && !new_field->decimals) new_field->length= 10; if (new_field->length > DECIMAL_MAX_PRECISION) { |