bk commit into 5.0 tree (hf:1.1971) BUG#12991

[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.1971 05/09/09 16:23:59 hf@deer.(none) +1 -0
  Fix for bug #12991 (compile error --without-geometry)

  myisam/mi_check.c
    1.136 05/09/09 16:22:28 hf@deer.(none) +4 -1
    this code shouldn't be compiled without Rtree keys's support

# 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.12991

--- 1.135/myisam/mi_check.c	Mon Sep  5 18:14:08 2005
+++ 1.136/myisam/mi_check.c	Fri Sep  9 16:22:28 2005
@@ -1045,9 +1045,12 @@
 	      /* We don't need to lock the key tree here as we don't allow
 		 concurrent threads when running myisamchk
 	      */
-              int search_result= (keyinfo->flag & HA_SPATIAL) ?
+              int search_result=
+#ifdef HAVE_RTREE_KEYS
+                (keyinfo->flag & HA_SPATIAL) ?
                 rtree_find_first(info, key, info->lastkey, key_length,
                                  SEARCH_SAME) : 
+#endif
                 _mi_search(info,keyinfo,info->lastkey,key_length,
                            SEARCH_SAME, info->s->state.key_root[key]);
               if (search_result)