diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 11:54:36 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 11:54:36 +0200 |
| commit | 5f6b100ed0eaacd644352972939a77f0a964c1af (patch) | |
| tree | db7782f75178512900e6e862142d57d3d0d96cf4 /mysql-test/r/gis.result | |
| parent | 6de8b295a7dd53b47f7e0d4ebc109dabb07c6397 (diff) | |
| parent | a006453fad260a35df973a8785f0d9a8977c1cac (diff) | |
| download | mariadb-git-5f6b100ed0eaacd644352972939a77f0a964c1af.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
client/mysqlimport.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
mysql-test/mysql-test-run.sh:
Merged from 4.1.
mysql-test/r/mysqldump.result:
Merged from 4.1.
mysql-test/t/gis.test:
Merged from 4.1.
Diffstat (limited to 'mysql-test/r/gis.result')
| -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 90857ecfc6d..454b33c28be 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -688,3 +688,9 @@ 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; +select (asWKT(geomfromwkb((0x000000000140240000000000004024000000000000)))); +(asWKT(geomfromwkb((0x000000000140240000000000004024000000000000)))) +POINT(10 10) +select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440)))); +(asWKT(geomfromwkb((0x010100000000000000000024400000000000002440)))) +POINT(10 10) |