From e1f31863ab255d3b5b7080cade58cc4e5983f6ce Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/deer.(none)" <>
Date: Sun, 1 Oct 2006 16:36:26 +0500
Subject: [PATCH] bug #21790 (UNKNOWN ERROR message in geometry)

We issued UNKNOWN ERROR initially in this place and forgot to
fix it when we implemented informative error message for this
---
 mysql-test/r/gis-rtree.result |  8 ++++++++
 mysql-test/t/gis-rtree.test   | 12 ++++++++++++
 sql/handler.cc                |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result
index b283d64395d..f872838f6f3 100644
--- a/mysql-test/r/gis-rtree.result
+++ b/mysql-test/r/gis-rtree.result
@@ -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;
diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/t/gis-rtree.test
index 163f2806ad2..091811b05b3 100644
--- a/mysql-test/t/gis-rtree.test
+++ b/mysql-test/t/gis-rtree.test
@@ -232,3 +232,15 @@ CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
 # End of 4.1 tests
+
+#
+# bug #21790 (UNKNOWN ERROR on NULLs in RTree)
+#
+CREATE TABLE t1(foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
+--error 1048
+INSERT INTO t1(foo) VALUES (NULL);
+--error 1416
+INSERT INTO t1() VALUES ();
+--error 1416
+INSERT INTO t1(foo) VALUES ('');
+DROP TABLE t1;
diff --git a/sql/handler.cc b/sql/handler.cc
index 4accc746664..3516b55feb5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1788,8 +1788,8 @@ void handler::print_error(int error, myf errflag)
     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;