Commit b8633901 authored by unknown's avatar unknown
Browse files

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

into moonbone.local:/work/14466-bug-5.0-mysql
parents 57ca4fac 8d13a5f4

sql/spatial.h

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ class Geometry 
  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,

  static int create_from_wkb(Geometry_buffer *buffer,

                             const char *wkb, uint32 len, String *res);

  int as_wkt(String *wkt, const char **end)

  {