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 */
       }
     }