mirror of
https://github.com/MariaDB/server.git
synced 2025-05-29 21:42:28 +03:00
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
This commit is contained in:
commit
b45cdbbd86
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user