diff options
| author | unknown <malff@lambda.weblab> | 2007-10-29 07:53:15 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.weblab> | 2007-10-29 07:53:15 -0600 |
| commit | 24ede323cc6b1b739e83736ea4fcca9052048ccd (patch) | |
| tree | 8c916dddc6236faf87d25771694702926fd47ee5 /sql/sql_table.cc | |
| parent | fa0e1d6b6b9f93b7ad84f8ba490d0e2de5a4553d (diff) | |
| parent | 6044965c4fe14785eb7294c68067486f7451a85f (diff) | |
| download | mariadb-git-24ede323cc6b1b739e83736ea4fcca9052048ccd.tar.gz | |
Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base
into lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 20b8c7a4278..0838b805b35 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -955,8 +955,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, sql_field->length= dup_field->char_length; sql_field->pack_length= dup_field->pack_length; sql_field->key_length= dup_field->key_length; - sql_field->create_length_to_internal_length(); sql_field->decimals= dup_field->decimals; + sql_field->create_length_to_internal_length(); sql_field->unireg_check= dup_field->unireg_check; /* We're making one field from two, the result field will have |