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

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

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
533d2187 · unknown · 6bd23c18 · 66978616 · 533d2187
Commit 533d2187 authored Mar 16, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +5 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4037,7 +4037,11 @@ create_index(
 		col_type = get_innobase_type_from_mysql_type(key_part->field);

 		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;