Commit 9946b15b authored by monty@mysql.com's avatar monty@mysql.com

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

into  mysql.com:/my/mysql-5.0
parents 74b3e9ae c2f224be
......@@ -245,8 +245,8 @@ public:
static Geometry *create_from_wkt(Geometry_buffer *buffer,
Gis_read_stream *trs, String *wkt,
bool init_stream=1);
static int Geometry::create_from_wkb(Geometry_buffer *buffer,
const char *wkb, uint32 len, String *res);
static int 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;
......
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