diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-05 18:22:35 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-05 18:22:35 +0400 |
| commit | 4660b8f094940dba93fdfc2743c1fb1138de565e (patch) | |
| tree | e8e2e1eb2f14e501eebbc3b53f140a1fd251f97e /sql/spatial.h | |
| parent | 7c98a501bdee3266c456ff7128befd849e5b3a47 (diff) | |
| parent | d4272a16deb9aa1b2428e446b2321697aebf9d94 (diff) | |
| download | mariadb-git-4660b8f094940dba93fdfc2743c1fb1138de565e.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b26038/b26038.5.0
sql/item_geofunc.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
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 109ac7f60cc..86232fcd524 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; |