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/gis-rtree.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/gis-rtree.result')
| -rw-r--r-- | mysql-test/r/gis-rtree.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index ac9582376a1..f8e0085bf59 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -167,7 +167,7 @@ count(*) 150 EXPLAIN SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))')); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range g g 32 NULL 8 Using where +1 SIMPLE t1 range g g 34 NULL 8 Using where SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))')); fid AsText(g) 1 LINESTRING(150 150,150 150) @@ -301,7 +301,7 @@ count(*) EXPLAIN SELECT fid, AsText(g) FROM t2 WHERE Within(g, GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))')); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range g g 32 NULL 4 Using where +1 SIMPLE t2 range g g 34 NULL 4 Using where SELECT fid, AsText(g) FROM t2 WHERE Within(g, GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))')); fid AsText(g) |