diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
| commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
| tree | f9d0655a0d901b87f918a736741144b502cba3f6 /mysql-test/r/gis.result | |
| parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
| parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
| download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz | |
5.3 merge
Diffstat (limited to 'mysql-test/r/gis.result')
| -rw-r--r-- | mysql-test/r/gis.result | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index b0938c8f131..7624544014a 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -968,7 +968,7 @@ COUNT(*) EXPLAIN SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)'); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ref p p 28 const 1 Using where +1 SIMPLE t2 ref p p 28 const # Using where SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)'); COUNT(*) 2 @@ -1061,39 +1061,9 @@ drop table t1; # create table t1(a char(32) not null) engine=myisam; create spatial index i on t1 (a); -ERROR 42000: A SPATIAL index may only contain a geometrical type column +ERROR HY000: Incorrect arguments to SPATIAL INDEX drop table t1; End of 5.1 tests -CREATE TABLE t1( -col0 BINARY NOT NULL, -col2 TIMESTAMP, -SPATIAL INDEX i1 (col0) -) ENGINE=MyISAM; -ERROR 42000: A SPATIAL index may only contain a geometrical type column -CREATE TABLE t1 ( -col0 BINARY NOT NULL, -col2 TIMESTAMP -) ENGINE=MyISAM; -CREATE SPATIAL INDEX idx0 ON t1(col0); -ERROR 42000: A SPATIAL index may only contain a geometrical type column -ALTER TABLE t1 ADD SPATIAL INDEX i1 (col0); -ERROR 42000: A SPATIAL index may only contain a geometrical type column -CREATE TABLE t2 ( -col0 INTEGER NOT NULL, -col1 POINT, -col2 POINT -); -CREATE SPATIAL INDEX idx0 ON t2 (col1, col2); -ERROR HY000: Incorrect arguments to SPATIAL INDEX -CREATE TABLE t3 ( -col0 INTEGER NOT NULL, -col1 POINT, -col2 LINESTRING, -SPATIAL INDEX i1 (col1, col2) -); -ERROR HY000: Incorrect arguments to SPATIAL INDEX -DROP TABLE t1; -DROP TABLE t2; select ST_AREA(ST_GEOMCOLLFROMTEXT(' GEOMETRYCOLLECTION(LINESTRING(100 100, 31 10, 77 80), POLYGON((0 0,4 7,1 1,0 0)), POINT(20 20))')); ST_AREA(ST_GEOMCOLLFROMTEXT(' GEOMETRYCOLLECTION(LINESTRING(100 100, 31 10, 77 80), POLYGON((0 0,4 7,1 1,0 0)), POINT(20 20))')) 1.5 |