summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-04-26 19:11:54 +0200
committerunknown <joerg@mysql.com>2005-04-26 19:11:54 +0200
commitcb23a8537ea3799e6453170a990e99db08d0574d (patch)
tree7d4bea1e0360d09b657e461828038f8d52bfb8b3 /myisam
parent545063c30f6ff502bcd8c1414ab7bbcffe0a6656 (diff)
parente7243a945603ad281729a87e34d74400acb02af4 (diff)
downloadmariadb-git-cb23a8537ea3799e6453170a990e99db08d0574d.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_key.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index ab5ddd3a378..d7d10e116aa 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -242,7 +242,10 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
{
k_length-=length;
if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
+ {
k_length-=2; /* Skip length */
+ old+= 2;
+ }
continue; /* Found NULL */
}
}