summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2005-10-29 02:36:57 +0400
committersergefp@mysql.com <>2005-10-29 02:36:57 +0400
commit09a4d0c7a76c7981c02863ae7500f36c4ed6f621 (patch)
tree45ae3ddd001a6f4023a0be5975954ff46ec00ea3 /sql/sql_table.cc
parent3e76aa38fac9fc5560fe2321f097f00b9f7d9a6f (diff)
parentf220d8747609a5814e85267ed62bf26132b6f322 (diff)
downloadmariadb-git-09a4d0c7a76c7981c02863ae7500f36c4ed6f621.tar.gz
4.1->5.0 merge
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 56a55d9fbc0..b635c44c6dc 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -839,8 +839,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
sql_field->charset= (dup_field->charset ?
dup_field->charset :
create_info->default_table_charset);
- sql_field->length= dup_field->length;
- sql_field->pack_length= dup_field->pack_length;
+ sql_field->length= dup_field->chars_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;