bk commit into 4.1 tree (svoj:1.2528) BUG#19702

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-26 20:52:59+05:00, svoj@stripped +1 -0
  BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexed
              table results in table corrupt
  
  Using myisamchk on compressed table with fulltext index could
  result in a crash or broken index.
  
  Fulltext key has always two keysegs, but is counted as one
  in keyinfo->keysegs. Thus we need to update keyinfo->keysegs + 1
  (last) element from seg array in case of compressed table.
  
  There is no way to provide a test case for this fix.

  myisam/mi_packrec.c@stripped, 2006-07-26 20:52:55+05:00, svoj@stripped +6 -4
    Fulltext key has always two keysegs, but is counted as one
    in keyinfo->keysegs. Thus we need to update keyinfo->keysegs + 1
    (last) element from seg array in case of compressed table.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	may.pils.ru
# Root:	/home/svoj/devel/mysql/BUG19702/mysql-4.1

--- 1.28/myisam/mi_packrec.c	2006-07-26 20:53:05 +05:00
+++ 1.29/myisam/mi_packrec.c	2006-07-26 20:53:05 +05:00
@@ -228,10 +228,12 @@
   {
     for (i=0 ; i < share->base.keys ; i++)
     {
-      share->keyinfo[i].keylength+=(uint16) diff_length;
-      share->keyinfo[i].minlength+=(uint16) diff_length;
-      share->keyinfo[i].maxlength+=(uint16) diff_length;
-      share->keyinfo[i].seg[share->keyinfo[i].keysegs].length=
+      MI_KEYDEF *keyinfo= &share->keyinfo[i];
+      keyinfo->keylength+= (uint16) diff_length;
+      keyinfo->minlength+= (uint16) diff_length;
+      keyinfo->maxlength+= (uint16) diff_length;
+      keyinfo->seg[keyinfo->flag & HA_FULLTEXT ?
+                   keyinfo->keysegs + 1 : keyinfo->keysegs].length=
 	(uint16) rec_reflength;
     }
   }