Skip to content

M
mariadb
Commit b8633901 authored by unknown's avatar unknown
Browse files
Options

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into moonbone.local:/work/14466-bug-5.0-mysql
parents 57ca4fac 8d13a5f4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/spatial.h
View file @ b8633901
...@@ -245,7 +245,7 @@ public: ...@@ -245,7 +245,7 @@ public:
static Geometry *create_from_wkt(Geometry_buffer *buffer, static Geometry *create_from_wkt(Geometry_buffer *buffer,
Gis_read_stream *trs, String *wkt, Gis_read_stream *trs, String *wkt,
bool init_stream=1); bool init_stream=1);
static int Geometry::create_from_wkb(Geometry_buffer *buffer, static int create_from_wkb(Geometry_buffer *buffer,
const char *wkb, uint32 len, String *res); const char *wkb, uint32 len, String *res);
int as_wkt(String *wkt, const char **end) int as_wkt(String *wkt, const char **end)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7