bk commit into 5.1 tree (holyfoot:1.2336)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2006-11-01 16:44:00+04:00, holyfoot@deer.(none) +2 -0
  Merge mysql.com:/home/hf/work/21790/my50-21790
  into  mysql.com:/home/hf/work/21790/my51-21790
  MERGE: 1.1810.1697.170

  mysql-test/r/gis-rtree.result@stripped, 2006-11-01 16:43:55+04:00, holyfoot@deer.(none) +0 -0
    Auto merged
    MERGE: 1.14.1.5

  sql/handler.cc@stripped, 2006-11-01 16:43:55+04:00, holyfoot@deer.(none) +0 -0
    Auto merged
    MERGE: 1.167.1.54

# 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/21790/my51-21790/RESYNC

--- 1.270/sql/handler.cc	2006-11-01 16:44:08 +04:00
+++ 1.271/sql/handler.cc	2006-11-01 16:44:08 +04:00
@@ -2092,8 +2092,8 @@ void handler::print_error(int error, myf
     break;
   }
   case HA_ERR_NULL_IN_SPATIAL:
-    textno= ER_UNKNOWN_ERROR;
-    break;
+    my_error(ER_CANT_CREATE_GEOMETRY_OBJECT, MYF(0));
+    DBUG_VOID_RETURN;
   case HA_ERR_FOUND_DUPP_UNIQUE:
     textno=ER_DUP_UNIQUE;
     break;

--- 1.21/mysql-test/r/gis-rtree.result	2006-11-01 16:44:08 +04:00
+++ 1.22/mysql-test/r/gis-rtree.result	2006-11-01 16:44:08 +04:00
@@ -862,3 +862,11 @@ 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 (NULL);
+ERROR 23000: Column 'foo' cannot be null
+INSERT INTO t1() VALUES ();
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+INSERT INTO t1(foo) VALUES ('');
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+DROP TABLE t1;