diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-23 11:44:14 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-23 11:44:14 +0300 |
commit | c5dfd3e193a0f348d694bddbe0b54c406a8a998d (patch) | |
tree | b06c9ed11a905264c96930def5aab8cf1965e43d /mysql-test/r/innodb_gis.result | |
parent | 565c105c84ca38e46f987a3f5edc78621f28ac42 (diff) | |
parent | 933bf869543b43f2a020ad09b881deba736ee838 (diff) | |
download | mariadb-git-c5dfd3e193a0f348d694bddbe0b54c406a8a998d.tar.gz |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
Auto merged
BitKeeper/deleted/.del-bdb_gis.test:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/innodb_gis.result:
merged 5.0-opt -> 5.1-opt
mysql-test/t/innodb_gis.test:
merged 5.0-opt -> 5.1-opt
sql/field.cc:
merged 5.0-opt -> 5.1-opt
sql/field.h:
merged 5.0-opt -> 5.1-opt
sql/sql_select.h:
merged 5.0-opt -> 5.1-opt
sql/sql_yacc.yy:
merged 5.0-opt -> 5.1-opt
sql/table.cc:
merged 5.0-opt -> 5.1-opt
Diffstat (limited to 'mysql-test/r/innodb_gis.result')
-rw-r--r-- | mysql-test/r/innodb_gis.result | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_gis.result b/mysql-test/r/innodb_gis.result index 7f54a78087b..a5a960a6cf5 100644 --- a/mysql-test/r/innodb_gis.result +++ b/mysql-test/r/innodb_gis.result @@ -545,6 +545,44 @@ SELECT Overlaps(@horiz1, @point2) FROM DUAL; Overlaps(@horiz1, @point2) 0 DROP TABLE t1; +CREATE TABLE t1 (p POINT); +CREATE TABLE t2 (p POINT, INDEX(p)); +INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)')); +INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)')); +SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)'); +COUNT(*) +1 +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 +SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)'); +COUNT(*) +1 +INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)')); +INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)')); +EXPLAIN +SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)'); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where +SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)'); +COUNT(*) +2 +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 +SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)'); +COUNT(*) +2 +EXPLAIN +SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)'); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 ALL NULL NULL NULL NULL 2 Using where +SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)'); +COUNT(*) +2 +DROP TABLE t1, t2; End of 5.0 tests create table t1 (g geometry not null, spatial gk(g)) engine=innodb; ERROR HY000: The used table type doesn't support SPATIAL indexes |