Commit 3a65c1b1 authored by unknown's avatar unknown
Browse files

gis.test corrected with Pem's wishes


mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  test corrected
parent 8ac7225d
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -670,10 +670,11 @@ create trigger t1_bu before update on t1 for each row set new.s1 = null;
insert into t1 values (null,null);
ERROR 23000: Column 's1' cannot be null
drop table t1;
drop procedure if exists fn3;
create function fn3 () returns point return GeomFromText("point(1 1)");
show create function fn3;
Function	sql_mode	Create Function
fn3		CREATE FUNCTION `test`.`fn3`() RETURNS point
fn3		CREATE FUNCTION `fn3`() RETURNS point
return GeomFromText("point(1 1)")
select astext(fn3());
astext(fn3())
+3 −0
Original line number Diff line number Diff line
@@ -387,6 +387,9 @@ drop table t1;
#
# Bug #10499 (function creation with GEOMETRY datatype)
#
--disable_warnings
drop procedure if exists fn3;
--enable_warnings
create function fn3 () returns point return GeomFromText("point(1 1)"); 
show create function fn3;
select astext(fn3());