bk commit into 5.0 tree (hf:1.1939) BUG#10839

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 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.1939 05/07/20 14:51:42 hf@deer.(none) +1 -0
  Fix for bug #10839 (myisamchk -rq crashes on spatial field)

  myisam/mi_create.c
    1.49 05/07/20 14:49:35 hf@deer.(none) +1 -1
    We actually have one real keyseg here - the geometry object itself.
    So we have to reduce on (sp_segs-1)

# 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-5.0.10839

--- 1.48/myisam/mi_create.c	Sun Jul  3 14:32:01 2005
+++ 1.49/myisam/mi_create.c	Wed Jul 20 14:49:35 2005
@@ -253,7 +253,7 @@
            MYI file and SPATIAL key *does have* additional sp_segs keysegs.
            We'd better delete them now
         */
-        keydef->keysegs-=sp_segs;
+        keydef->keysegs-=(sp_segs-1);
       }
 
       for (j=0, keyseg=keydef->seg ; (int) j < keydef->keysegs ;