Commit 533d2187 authored by unknown's avatar unknown

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

parents 6bd23c18 66978616
...@@ -4037,7 +4037,11 @@ create_index( ...@@ -4037,7 +4037,11 @@ create_index(
col_type = get_innobase_type_from_mysql_type(key_part->field); col_type = get_innobase_type_from_mysql_type(key_part->field);
if (DATA_BLOB == col_type if (DATA_BLOB == col_type
|| key_part->length < field->pack_length()) { || (key_part->length < field->pack_length()
&& field->type() != MYSQL_TYPE_VARCHAR)
|| (field->type() == MYSQL_TYPE_VARCHAR
&& key_part->length < field->pack_length()
- ((Field_varstring*)field)->length_bytes)) {
prefix_len = key_part->length; prefix_len = key_part->length;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment