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: test result mysql-test/t/gis-rtree.test: test case sql/handler.cc: let's issue informative error message here
This commit is contained in:
parent
04bf9cc7c6
commit
b8ab82a629
@ -862,3 +862,11 @@ CHECK TABLE t1 EXTENDED;
|
|||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
DROP TABLE t1;
|
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;
|
||||||
|
@ -232,3 +232,15 @@ CHECK TABLE t1 EXTENDED;
|
|||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
# End of 4.1 tests
|
# 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;
|
||||||
|
@ -1788,8 +1788,8 @@ void handler::print_error(int error, myf errflag)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case HA_ERR_NULL_IN_SPATIAL:
|
case HA_ERR_NULL_IN_SPATIAL:
|
||||||
textno= ER_UNKNOWN_ERROR;
|
my_error(ER_CANT_CREATE_GEOMETRY_OBJECT, MYF(0));
|
||||||
break;
|
DBUG_VOID_RETURN;
|
||||||
case HA_ERR_FOUND_DUPP_UNIQUE:
|
case HA_ERR_FOUND_DUPP_UNIQUE:
|
||||||
textno=ER_DUP_UNIQUE;
|
textno=ER_DUP_UNIQUE;
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user