diff options
| author | unknown <jimw@mysql.com> | 2005-08-30 14:36:07 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-30 14:36:07 -0700 |
| commit | b7f4a6909531d0d28f47f33e73f55078ef31ea24 (patch) | |
| tree | 464ce2f3c1917daef296060951bc561918049a12 /sql | |
| parent | 668f9ec27ac419e12b0122305af1ebef2632859b (diff) | |
| parent | a8b50d85b4b45da3001cdd310b698f19b0a85799 (diff) | |
| download | mariadb-git-b7f4a6909531d0d28f47f33e73f55078ef31ea24.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 6 | ||||
| -rw-r--r-- | sql/sql_select.cc | 4 |
2 files changed, 7 insertions, 3 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); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b676cbb1fea..e7af2a1aa75 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4899,6 +4899,8 @@ static Field* create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, item->name, table, item->unsigned_flag); break; case STRING_RESULT: + DBUG_ASSERT(item->collation.collation); + enum enum_field_types type; /* DATE/TIME fields have STRING_RESULT result type. To preserve @@ -4907,7 +4909,7 @@ static Field* create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, if ((type= item->field_type()) == MYSQL_TYPE_DATETIME || type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE) new_field= item->tmp_table_field_from_field_type(table); - else if (item->max_length > 255) + else if (item->max_length/item->collation.collation->mbmaxlen > 255) { if (convert_blob_length) new_field= new Field_varstring(convert_blob_length, maybe_null, |