bk commit into 5.0 tree (holyfoot:1.2281)

[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@stripped, 2006-09-29 17:57:16+05:00, holyfoot@stripped +3 -0
  Merge mysql.com:/home/hf/work/21888/my41-21888
  into  mysql.com:/home/hf/work/21888/my50-21888
  MERGE: 1.1616.2744.2

  myisam/mi_range.c@stripped, 2006-09-29 17:57:11+05:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.1

  mysql-test/r/gis-rtree.result@stripped, 2006-09-29 17:57:11+05:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.6

  mysql-test/t/gis-rtree.test@stripped, 2006-09-29 17:57:11+05:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.5

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/21888/my50-21888/RESYNC

--- 1.15/myisam/mi_range.c	2006-09-29 17:57:22 +05:00
+++ 1.16/myisam/mi_range.c	2006-09-29 17:57:22 +05:00
@@ -71,6 +71,21 @@ ha_rows mi_records_in_range(MI_INFO *inf
     uchar * key_buff;
     uint start_key_len;
 
+    /*
+      The problem is that the optimizer doesn't support
+      RTree keys properly at the moment.
+      Hope this will be fixed some day.
+      But now NULL in the min_key means that we
+      didn't make the task for the RTree key
+      and expect BTree functionality from it.
+      As it's not able to handle such request
+      we return the error.
+    */
+    if (!min_key)
+    {
+      res= HA_POS_ERROR;
+      break;
+    }
     key_buff= info->lastkey+info->s->base.max_key_length;
     start_key_len= _mi_pack_key(info,inx, key_buff,
                                 (uchar*) min_key->key, min_key->length,

--- 1.18/mysql-test/r/gis-rtree.result	2006-09-29 17:57:22 +05:00
+++ 1.19/mysql-test/r/gis-rtree.result	2006-09-29 17:57:22 +05:00
@@ -862,3 +862,14 @@ CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 DROP TABLE t1;
+CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,1)));
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,0)));
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,1)));
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,0)));
+SELECT 1 FROM t1 WHERE foo != PointFromWKB(POINT(0,0));
+1
+1
+1
+1
+DROP TABLE t1;

--- 1.17/mysql-test/t/gis-rtree.test	2006-09-29 17:57:22 +05:00
+++ 1.18/mysql-test/t/gis-rtree.test	2006-09-29 17:57:22 +05:00
@@ -231,4 +231,14 @@ INSERT INTO t1 (c1) VALUES (
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
+#
+# Bug #21888: Query on GEOMETRY field using PointFromWKB() results in lost connection
+#
+CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,1)));
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,0)));
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,1)));
+INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,0)));
+SELECT 1 FROM t1 WHERE foo != PointFromWKB(POINT(0,0));
+DROP TABLE t1;
 # End of 4.1 tests