diff options
| author | unknown <gluh@gluh.(none)> | 2006-12-12 17:59:34 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.(none)> | 2006-12-12 17:59:34 +0400 |
| commit | e564a61f8f7316e317d1949697695c188511d509 (patch) | |
| tree | 8d5cfe93d01fa5ab58cf24e8c6b05e186486e1cd /mysql-test/r/gis.result | |
| parent | 6bcdfc449ede4453f4d3f0d0a89d7e703961b2bb (diff) | |
| parent | 87e0838f98f795bfc9272bc28dd0751e77f32f69 (diff) | |
| download | mariadb-git-e564a61f8f7316e317d1949697695c188511d509.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/gis.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
Diffstat (limited to 'mysql-test/r/gis.result')
| -rw-r--r-- | mysql-test/r/gis.result | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 3848368fedd..b7f0e4b6b80 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -673,6 +673,22 @@ POINT(10 10) select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440)))); (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440)))) POINT(10 10) +create table t1 (g GEOMETRY); +select * from t1; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +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 +asbinary(g) +drop table t1; +create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); +alter table t1 disable keys; +load data infile '../std_data_ln/bad_gis_data.dat' into table t1; +ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1 +alter table t1 enable keys; +drop table t1; 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; insert into t1 values (null,null); @@ -697,16 +713,6 @@ alter table t1 add primary key pti(pt); ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length alter table t1 add primary key pti(pt(20)); drop table t1; -create table t1 (g GEOMETRY); -select * from t1; -Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -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 -asbinary(g) -drop table t1; create table t1 select GeomFromText('point(1 1)'); desc t1; Field Type Null Key Default Extra |