diff options
| author | unknown <evgen@moonbone.local> | 2005-11-02 21:47:35 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-11-02 21:47:35 +0300 |
| commit | b8633901d0be465797f1d8d075567669d73c7975 (patch) | |
| tree | eb53b15b9931fbf891f2f6e2bfa563e94fd50b7e | |
| parent | 57ca4facb908c7ff5c92a510294db2a19a1e385c (diff) | |
| parent | 8d13a5f4bc2a3dfbf1a89466f1e1bc7277d9c85a (diff) | |
| download | mariadb-git-b8633901d0be465797f1d8d075567669d73c7975.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql
| -rw-r--r-- | sql/spatial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index 6189d5c1462..4253689c078 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -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; |