diff options
| author | konstantin@mysql.com <> | 2006-02-24 00:12:04 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2006-02-24 00:12:04 +0300 |
| commit | 49ad134e9fb7a24afcd43c17048e8720df44289a (patch) | |
| tree | 44af64dff6981f58cc1b38ada2d6d3ca5185cdad /sql/field.cc | |
| parent | 90edf3720a2b3c2f2de1dcf6893223b3b70121fb (diff) | |
| download | mariadb-git-49ad134e9fb7a24afcd43c17048e8720df44289a.tar.gz | |
After-merge fixes (Bug#13134)
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 31fbf9868e4..35312caf313 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8269,7 +8269,7 @@ void create_field::init_for_tmp_table(enum_field_types sql_type_arg, { field_name= ""; sql_type= sql_type_arg; - length= length_arg;; + char_length= length= length_arg;; unireg_check= Field::NONE; interval= 0; charset= &my_charset_bin; @@ -8597,6 +8597,8 @@ bool create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, case FIELD_TYPE_DECIMAL: DBUG_ASSERT(0); /* Was obsolete */ } + /* Remember the value of length */ + char_length= length; if (!(flags & BLOB_FLAG) && ((length > max_field_charlength && fld_type != FIELD_TYPE_SET && |