diff options
| author | unknown <ingo@mysql.com> | 2006-07-05 11:20:10 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-07-05 11:20:10 +0200 |
| commit | fef31470d5f2114f374ba181e7937d728526cbaf (patch) | |
| tree | 4c78c2445fa863be62cde1c40ae6490a1ad3ec23 /mysql-test/r/gis.result | |
| parent | 516fdb7197a27822e0a7623843fdb326473777e9 (diff) | |
| parent | 752b826e0d890b2c3b28146089611c1982b459ed (diff) | |
| download | mariadb-git-fef31470d5f2114f374ba181e7937d728526cbaf.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-bug14400
into mysql.com:/home/mydev/mysql-5.0-ateam
libmysqld/libmysqld.c:
Auto merged
myisam/mi_rkey.c:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/lib_sql.cc:
Manual merge
mysql-test/r/func_time.result:
Manual merge
mysql-test/r/gis.result:
Manual merge
mysql-test/t/func_time.test:
Manual merge
mysql-test/t/gis.test:
Manual merge
sql-common/client.c:
Manual merge
Diffstat (limited to 'mysql-test/r/gis.result')
| -rw-r--r-- | mysql-test/r/gis.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 13e2d56d83e..4140e13da12 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -671,6 +671,15 @@ 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 8192 0 Y 128 0 63 +asbinary(g) 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); |