1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2004-06-10 12:36:11 +03:00
7 changed files with 35 additions and 18 deletions

View File

@@ -3158,10 +3158,12 @@ bool add_field_to_list(char *field_name, enum_field_types type,
break;
case FIELD_TYPE_DECIMAL:
if (!length)
if (new_field->length= new_field->decimals)
{
if ((new_field->length= new_field->decimals))
new_field->length++;
else
new_field->length=10; // Default length for DECIMAL
new_field->length= 10; // Default length for DECIMAL
}
if (new_field->length < MAX_FIELD_WIDTH) // Skip wrong argument
{
new_field->length+=sign_len;