summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2005-11-08 05:36:25 +0300
committerunknown <sergefp@mysql.com>2005-11-08 05:36:25 +0300
commit224e85536e04abe5bfb329e019fe519fbc57b434 (patch)
tree4e061b2f2020edf9a2e9867c6bff89ba3f3d7097 /myisam
parent3a528ddfe23649a5c94ed10fede246f5229bce17 (diff)
parent81882f7127b9d52cd46c92006e1a2231a70c8849 (diff)
downloadmariadb-git-224e85536e04abe5bfb329e019fe519fbc57b434.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 */
}
}