diff options
| author | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-02-28 12:13:46 +0400 |
|---|---|---|
| committer | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-02-28 12:13:46 +0400 |
| commit | 08431e7865c1195afdc167a74b97ad932a0a58a7 (patch) | |
| tree | 512ba10b1044d921271065de17ad13876346eb22 /sql/spatial.h | |
| parent | 486dfab32b41a609db3c44ddac7990ed597e86d2 (diff) | |
| parent | 049251624a6719d6330e3fa76c0dd591d0609016 (diff) | |
| download | mariadb-git-08431e7865c1195afdc167a74b97ad932a0a58a7.tar.gz | |
Merge mysql.com:/home/ram/work/b26038/b26038.4.1
into mysql.com:/home/ram/work/b26038/b26038.5.0
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 3e398ac6200..0f7b845f53b 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; |