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 | f3b35fbf6792c27f43e33599ad3bee3651e6db2f (patch) | |
tree | b06c9ed11a905264c96930def5aab8cf1965e43d /mysql-test/r/gis.result | |
parent | b5603c29b699c9722e833f54553c39066fbcd5eb (diff) | |
parent | 241ede38d159d8f58405d9d81d63ef2e67c0715d (diff) | |
download | mariadb-git-f3b35fbf6792c27f43e33599ad3bee3651e6db2f.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/gis.result')
-rw-r--r-- | mysql-test/r/gis.result | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 1942124b8bd..61394409947 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -895,6 +895,45 @@ drop table t1, t2; SELECT 1; 1 1 +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 system p NULL NULL NULL 1 +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 End of 5.0 tests create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime); create view v1 as select * from t1; |