diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-05 16:33:08 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-05 16:33:08 +0500 |
| commit | 071e55af0db16f3f8d2b703433e8ed8b0edcfa99 (patch) | |
| tree | 1a120ed6b5d577899a2512b84968b4c10dabf9e6 /mysql-test/r | |
| parent | c7aff98271c12c652c0a2c0951dfaf8ff3068487 (diff) | |
| parent | 77d786b5a0cd303d30b9a22a044b916078551e6c (diff) | |
| download | mariadb-git-071e55af0db16f3f8d2b703433e8ed8b0edcfa99.tar.gz | |
Merge mysql.com:/home/hf/work/30286/my41-30286
into mysql.com:/home/hf/work/30286/my50-30286
mysql-test/t/gis.test:
Auto merged
sql/gstream.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/gis.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index f6189ec1236..55f42141adb 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -736,6 +736,12 @@ SELECT * FROM t1; a NULL DROP TABLE t1; +CREATE TABLE `t1` ( `col9` set('a'), `col89` date); +INSERT INTO `t1` VALUES ('','0000-00-00'); +select geomfromtext(col9,col89) as a from t1; +a +NULL +DROP TABLE t1; 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; |