1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
This commit is contained in:
gluh@gluh.mysql.r18.ru 2005-03-16 18:09:01 +03:00
commit cb29afef03
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/ha_innodb.cc
View File

@ -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;