From 19a38fb186ecda3a037a4a0fa87d3400544b4c4e Mon Sep 17 00:00:00 2001
From: unknown <sergefp@mysql.com>
Date: Tue, 8 Nov 2005 11:26:02 +0300
Subject: [PATCH] Trivial post-merge fixes

---
 myisam/mi_key.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index 0ee34c2f41e..4cabfc91197 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -241,8 +241,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;
-->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
-
+        if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
+        {
           k_length-=2;                                  /* Skip length */
           old+= 2;
         }