Trivial post-merge fixes

84101eb8 · sergefp@mysql.com · c5276ebc · 84101eb8
Commit 84101eb8 authored Nov 08, 2005 by sergefp@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

myisam/mi_key.c myisam/mi_key.c +2 -2

No files found.
--- 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;
        }