summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-06-09 00:08:24 +0200
committerserg@serg.mylan <>2004-06-09 00:08:24 +0200
commita8a8da39200317224be1686edfd4eb1dde4dba54 (patch)
treea9380fafc0537f0b0a7b792971f556fd53cc85f4 /sql
parent5d947f7b97542e85feea4eb646b9b04ba075be54 (diff)
downloadmariadb-git-a8a8da39200317224be1686edfd4eb1dde4dba54.tar.gz
different (simpler and more compatible) fix for bug#4046
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a9723108674..fb81240b893 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3157,7 +3157,10 @@ bool add_field_to_list(char *field_name, enum_field_types type,
break;
case FIELD_TYPE_DECIMAL:
if (!length)
- new_field->length= 10; // Default length for DECIMAL
+ if (new_field->length= new_field->decimals)
+ new_field->length++;
+ else
+ new_field->length=10; // Default length for DECIMAL
if (new_field->length < MAX_FIELD_WIDTH) // Skip wrong argument
{
new_field->length+=sign_len;