summaryrefslogtreecommitdiff
path: root/sql/key.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-02-11 00:06:46 +0100
committermonty@mysql.com <>2004-02-11 00:06:46 +0100
commitce145789092b294a562f565671478ae2bf51d14a (patch)
tree927515d304bd661aebdb0e534418caf49d322ada /sql/key.cc
parent0c6a0b9a3118948efeedefd036d2994982babd08 (diff)
parentefb134f3a874befe4ab1779f597ada09f57ca191 (diff)
downloadmariadb-git-ce145789092b294a562f565671478ae2bf51d14a.tar.gz
Merge with 4.0.18
Diffstat (limited to 'sql/key.cc')
-rw-r--r--sql/key.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc
index 639b1e535a6..d4499573e8e 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -182,9 +182,9 @@ int key_cmp(TABLE *table,const byte *key,uint idx,uint key_length)
}
if (key_part->key_part_flag & (HA_BLOB_PART | HA_VAR_LENGTH))
{
- if (key_part->field->key_cmp(key, key_part->length+2))
+ if (key_part->field->key_cmp(key, key_part->length+ HA_KEY_BLOB_LENGTH))
return 1;
- length=key_part->length+2;
+ length=key_part->length+HA_KEY_BLOB_LENGTH;
}
else
{