summaryrefslogtreecommitdiff
path: root/myisam/mi_key.c
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-01 13:26:01 +0200
committerunknown <serg@serg.mylan>2004-08-01 13:26:01 +0200
commit04f2d8b48bd02cbb346444c6a7ad6855a340d71e (patch)
tree6d221952b67a636cef97629f4983774c40f53206 /myisam/mi_key.c
parenta10f625e601fa95e84ba5917881f313dae6b6778 (diff)
downloadmariadb-git-04f2d8b48bd02cbb346444c6a7ad6855a340d71e.tar.gz
bug#4816. index search for NULL in blob
Diffstat (limited to 'myisam/mi_key.c')
-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 */
}
}