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

into mysql.com:/my/mysql-5.0

Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
b45cdbbd · unknown · a8ad5d16 · 8d13a5f4 · b45cdbbd
Commit b45cdbbd authored Nov 02, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/spatial.h sql/spatial.h +2 -2

No files found.
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -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)
  {