diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 22:06:55 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 22:06:55 +0200 |
commit | bd3c8f47cd16b4795dd073bbd30decd804c76969 (patch) | |
tree | 684f91877eb6835e6335d614fafce9841eaf30af /mysql-test/main/gis.result | |
parent | d529389358fb0c7f3e642d34d7fd84df307b9d29 (diff) | |
parent | fd5c36bed5de65e85900c9fc9f0ed2092c4b38c5 (diff) | |
download | mariadb-git-bd3c8f47cd16b4795dd073bbd30decd804c76969.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/gis.result')
-rw-r--r-- | mysql-test/main/gis.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result index 09afb6033b3..0c6a3d2c843 100644 --- a/mysql-test/main/gis.result +++ b/mysql-test/main/gis.result @@ -1683,7 +1683,7 @@ NULL # create table t1 (pt point); insert into t1 values(Geomfromtext('POLYGON((1 1, 2 2, 2 1, 1 1))')); -ERROR 22007: Incorrect POINT value: 'POLYGON' for column `test`.`t1`.`pt` at row 1 +ERROR 22007: Incorrect POINT value: 'POLYGON((1 1,2 2,2 1,1 1))' for column `test`.`t1`.`pt` at row 1 drop table t1; SELECT st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100)); st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100)) @@ -5028,13 +5028,13 @@ ERROR HY000: Illegal parameter data types int and geometry for operation 'in' CREATE TABLE t1 (a POINT) ENGINE=MyISAM; INSERT INTO t1 VALUES (Point(0,0)); ALTER TABLE t1 MODIFY a LINESTRING; -ERROR 22007: Incorrect LINESTRING value: 'POINT' for column `test`.`t1`.`a` at row 1 +ERROR 22007: Incorrect LINESTRING value: 'POINT(0 0)' for column `test`.`t1`.`a` at row 1 DROP TABLE t1; CREATE TABLE t1 (a LINESTRING); CREATE TABLE t2 (a POINT); INSERT INTO t2 VALUES (POINT(0,0)); INSERT INTO t1 SELECT * FROM t2; -ERROR 22007: Incorrect LINESTRING value: 'POINT' for column `test`.`t1`.`a` at row 1 +ERROR 22007: Incorrect LINESTRING value: 'POINT(0 0)' for column `test`.`t1`.`a` at row 1 SELECT AsText(a) FROM t1; AsText(a) DROP TABLE t1, t2; |