diff options
| author | konstantin@mysql.com <> | 2006-02-24 00:00:15 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2006-02-24 00:00:15 +0300 |
| commit | af62c4a9596d6d35157e522b5ae6302475107b36 (patch) | |
| tree | 1cad1f5d22790e28978c846e656214eaccf50aa0 /sql/field.cc | |
| parent | 630869bc56c9af889865003a2aaab0482d4bbcde (diff) | |
| parent | 7178f247f531ce3a3dd2faee520027ea8d2fad88 (diff) | |
| download | mariadb-git-af62c4a9596d6d35157e522b5ae6302475107b36.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-13134
into mysql.com:/opt/local/work/mysql-5.0-runtime
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 3a0e788b0c1..31fbf9868e4 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8213,13 +8213,11 @@ void Field_bit_as_char::sql_type(String &res) const create_field::create_length_to_internal_length() DESCRIPTION - Convert create_field::length from number of characters to number of bytes, - save original value in chars_length. + Convert create_field::length from number of characters to number of bytes. */ void create_field::create_length_to_internal_length(void) { - chars_length= length; switch (sql_type) { case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_MEDIUM_BLOB: @@ -8937,6 +8935,7 @@ create_field::create_field(Field *old_field,Field *orig_field) else interval=0; def=0; + char_length= length; if (!(flags & (NO_DEFAULT_VALUE_FLAG | BLOB_FLAG)) && old_field->ptr && orig_field && |