diff options
| author | unknown <evgen@moonbone.local> | 2005-08-30 23:29:47 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-08-30 23:29:47 +0400 |
| commit | 15bea314cc686f9ed9813cf8e056831cea9f121e (patch) | |
| tree | 2eec44168d9216c78f967e51c6830acdd67025a6 /sql/item.cc | |
| parent | e6ac9175d13091b8bd7661b5e8ae8d3add81fbb0 (diff) | |
| parent | 033faf7256604c5ba2edec8ddc846f663488cd16 (diff) | |
| download | mariadb-git-15bea314cc686f9ed9813cf8e056831cea9f121e.tar.gz | |
manual merge of bug fix#12537
sql/item.cc:
Auto merged
sql/sql_select.cc:
manual merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 2d4f9138a51..7aaa678ddb0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2047,12 +2047,14 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) case MYSQL_TYPE_ENUM: case MYSQL_TYPE_SET: case MYSQL_TYPE_VAR_STRING: - if (max_length > 255) + DBUG_ASSERT(collation.collation); + if (max_length/collation.collation->mbmaxlen > 255) break; // If blob return new Field_varstring(max_length, maybe_null, name, table, collation.collation); case MYSQL_TYPE_STRING: - if (max_length > 255) // If blob + DBUG_ASSERT(collation.collation); + if (max_length/collation.collation->mbmaxlen > 255) // If blob break; return new Field_string(max_length, maybe_null, name, table, collation.collation); |