summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-01 13:26:01 +0200
committerserg@serg.mylan <>2004-08-01 13:26:01 +0200
commitf4244cd00e0a97b1e92f78fef4da3cfdad2664ca (patch)
tree6d221952b67a636cef97629f4983774c40f53206 /myisam
parent22ca5582d005754d3907ce6bc088ba2d9710d1eb (diff)
downloadmariadb-git-f4244cd00e0a97b1e92f78fef4da3cfdad2664ca.tar.gz
bug#4816. index search for NULL in blob
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_key.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index 766ecf334b6..1688ab74823 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -177,6 +177,8 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
if (!(*key++= (char) 1-*old++)) /* Copy null marker */
{
k_length-=length;
+ if (keyseg->flag & (HA_VAR_LENGTH | HA_BLOB_PART))
+ k_length-=2; /* Skip length */
continue; /* Found NULL */
}
}