summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2005-11-08 05:36:25 +0300
committersergefp@mysql.com <>2005-11-08 05:36:25 +0300
commit41bc2336997bd52d9c2909549414da9e3d375d79 (patch)
tree4e061b2f2020edf9a2e9867c6bff89ba3f3d7097 /myisam
parent565674054252e9a0631679701e2887d78bd49e9f (diff)
parent8b9bab27634a012e35b87c440000e2c9ebc9f078 (diff)
downloadmariadb-git-41bc2336997bd52d9c2909549414da9e3d375d79.tar.gz
Merge mysql.com:/home/psergey/mysql-4.1-bug13814
into mysql.com:/home/psergey/mysql-4.1-nov08-push
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 9df22889b22..f4b92f969db 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -217,7 +217,10 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
{
k_length-=length;
if (keyseg->flag & (HA_VAR_LENGTH | HA_BLOB_PART))
+ {
+ old+= 2;
k_length-=2; /* Skip length */
+ }
continue; /* Found NULL */
}
}