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/t/gis.test | |
parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz |
5.3 merge
Diffstat (limited to 'mysql-test/t/gis.test')
-rw-r--r-- | mysql-test/t/gis.test | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 202e4f88cd8..f1e85ac0e40 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -753,57 +753,14 @@ drop table t1; --echo # on char > 31 bytes". --echo # create table t1(a char(32) not null) engine=myisam; ---error ER_SPATIAL_MUST_HAVE_GEOM_COL +--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/ +--error ER_WRONG_ARGUMENTS create spatial index i on t1 (a); drop table t1; --echo End of 5.1 tests -# -# Bug #50574 5.5.x allows spatial indexes on non-spatial -# columns, causing crashes! -# ---error ER_SPATIAL_MUST_HAVE_GEOM_COL -CREATE TABLE t1( - col0 BINARY NOT NULL, - col2 TIMESTAMP, - SPATIAL INDEX i1 (col0) -) ENGINE=MyISAM; - -# Test other ways to add indices -CREATE TABLE t1 ( - col0 BINARY NOT NULL, - col2 TIMESTAMP -) ENGINE=MyISAM; - ---error ER_SPATIAL_MUST_HAVE_GEOM_COL -CREATE SPATIAL INDEX idx0 ON t1(col0); - ---error ER_SPATIAL_MUST_HAVE_GEOM_COL -ALTER TABLE t1 ADD SPATIAL INDEX i1 (col0); - -CREATE TABLE t2 ( - col0 INTEGER NOT NULL, - col1 POINT, - col2 POINT -); - ---error ER_WRONG_ARGUMENTS -CREATE SPATIAL INDEX idx0 ON t2 (col1, col2); - ---error ER_WRONG_ARGUMENTS -CREATE TABLE t3 ( - col0 INTEGER NOT NULL, - col1 POINT, - col2 LINESTRING, - SPATIAL INDEX i1 (col1, col2) -); - -# cleanup -DROP TABLE t1; -DROP TABLE t2; - #bug 850775 ST_AREA does not work on GEOMETRYCOLLECTIONs in maria-5.3-gis 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))')); |