diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-02-13 01:22:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-02-13 01:22:43 +0400 |
| commit | d30e1c76ae94134bebae247d409c3695612f60cd (patch) | |
| tree | a59eeda9c7029dbe5cbace146d40ed7408151567 /mysql-test/r/gis.result | |
| parent | c01bbd33d79ac5f7ba822a3c8cadb0c31364e366 (diff) | |
| parent | 07f36668aecfd3d811c4ed5eb23b1bfdb8c86fdd (diff) | |
| download | mariadb-git-d30e1c76ae94134bebae247d409c3695612f60cd.tar.gz | |
Merge mysql.com:/home/hf/work/20691/my50-20691
into mysql.com:/home/hf/work/20691/my51-20691
mysql-test/r/default.result:
Auto merged
sql/item.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
merging
Diffstat (limited to 'mysql-test/r/gis.result')
| -rw-r--r-- | mysql-test/r/gis.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 8cbc344f062..6483b12acb0 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -718,6 +718,10 @@ desc t1; Field Type Null Key Default Extra GeomFromText('point(1 1)') geometry NO drop table t1; +create table t1 (g geometry not null); +insert into t1 values(default); +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +drop table t1; create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime); create view v1 as select * from t1; desc v1; |