bk commit into 4.1 tree (hf:1.2343) BUG#10893

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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
  1.2343 05/07/23 20:04:15 hf@deer.(none) +1 -0
  Fix for bug #10893 (myisamchk fails on packed spatial)
  need to be fixed in 4.1

  myisam/mi_create.c
    1.47 05/07/23 20:03:31 hf@deer.(none) +4 -2
    now we decrease on the proper value

# 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.10839

--- 1.46/myisam/mi_create.c	Thu Jun 30 19:55:44 2005
+++ 1.47/myisam/mi_create.c	Sat Jul 23 20:03:31 2005
@@ -254,9 +254,11 @@
         /*
            called by myisamchk - i.e. table structure was taken from
            MYI file and SPATIAL key *does have* additional sp_segs keysegs.
-           We'd better delete them now
+           keydef->seg here points right at the GEOMETRY segment,
+           so we only need to decrease keydef->keysegs.
+           (see recreate_table() in mi_check.c)
         */
-        keydef->keysegs-=sp_segs;
+        keydef->keysegs-=sp_segs-1;
       }
 
       for (j=0, keyseg=keydef->seg ; (int) j < keydef->keysegs ;