diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-17 17:12:18 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-17 17:12:18 +0400 |
| commit | 5fac132b5f5d81af73d22c5bf2e13505d9927930 (patch) | |
| tree | 8967cd00403e688cc4f312430d342326e049d799 /mysql-test/r | |
| parent | b61146e1f6cb24ecf6b56a199abb13be5e4e7a8e (diff) | |
| parent | be99cfef545468a0257a0798dabda491224f33f7 (diff) | |
| download | mariadb-git-5fac132b5f5d81af73d22c5bf2e13505d9927930.tar.gz | |
Merge mysql.com:/home/hf/work/31158/my50-31158
into mysql.com:/home/hf/work/31158/my51-31158
mysql-test/t/gis.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_geofunc.cc:
Auto merged
mysql-test/r/gis.result:
merging
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/gis.result | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 61394409947..cab55b2d7ba 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -680,7 +680,7 @@ def test t1 t1 g g 255 4294967295 0 Y 144 0 63 g select asbinary(g) from t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def asbinary(g) 252 16777216 0 Y 128 0 63 +def asbinary(g) 252 4294967295 0 Y 128 0 63 asbinary(g) drop table t1; create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); @@ -742,6 +742,30 @@ select geomfromtext(col9,col89) as a from t1; a NULL DROP TABLE t1; +CREATE TABLE t1 ( +geomdata polygon NOT NULL, +SPATIAL KEY index_geom (geomdata) +) ENGINE=MyISAM DEFAULT CHARSET=latin2 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED; +CREATE TABLE t2 ( +geomdata polygon NOT NULL, +SPATIAL KEY index_geom (geomdata) +) ENGINE=MyISAM DEFAULT CHARSET=latin2 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED; +CREATE TABLE t3 +select +aswkb(ws.geomdata) AS geomdatawkb +from +t1 ws +union +select +aswkb(ws.geomdata) AS geomdatawkb +from +t2 ws; +describe t3; +Field Type Null Key Default Extra +geomdatawkb longblob YES NULL +drop table t1; +drop table t2; +drop table t3; End of 4.1 tests create table t1 (s1 geometry not null,s2 char(100)); create trigger t1_bu before update on t1 for each row set new.s1 = null; |