diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-03-05 17:12:37 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-03-05 17:12:37 +0400 |
| commit | 57c08a6a3355faa28ab243281e8aca86f1e7b46c (patch) | |
| tree | 4e122dc2fcc68efa8a2682f9282622f6e00664a8 /sql/spatial.h | |
| parent | 71a25f2b3e07abd83affc63c485fb69366fa369a (diff) | |
| parent | d4272a16deb9aa1b2428e446b2321697aebf9d94 (diff) | |
| download | mariadb-git-57c08a6a3355faa28ab243281e8aca86f1e7b46c.tar.gz | |
Merge mysql.com:/home/ram/work/b26038/b26038.5.0
into mysql.com:/home/ram/work/b26038/b26038.5.1
mysql-test/t/gis.test:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
mysql-test/include/gis_generic.inc:
manual merge
mysql-test/r/archive_gis.result:
manual merge
mysql-test/r/gis.result:
manual merge
mysql-test/r/innodb_gis.result:
manual merge
mysql-test/r/ndb_gis.result:
manual merge
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index f0c8b7bba28..0c0452b5abc 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -246,8 +246,8 @@ public: static Geometry *create_from_wkt(Geometry_buffer *buffer, Gis_read_stream *trs, String *wkt, bool init_stream=1); - static int create_from_wkb(Geometry_buffer *buffer, - const char *wkb, uint32 len, String *res); + static Geometry *create_from_wkb(Geometry_buffer *buffer, const char *wkb, + uint32 len, String *res); int as_wkt(String *wkt, const char **end) { uint32 len= get_class_info()->m_name.length; |