diff options
| author | unknown <kent@mysql.com> | 2005-11-07 13:39:03 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-07 13:39:03 +0100 |
| commit | 2e7c3675194ada4924e09a06275e4268a3618d78 (patch) | |
| tree | b095a0afb93cf1e8690541147d4e996ab91a1e25 | |
| parent | b0701a5c3b3653082d69ee2429ba279adce2f53b (diff) | |
| parent | 0e878d7e541983757bc0b31e7caa8a16a5fd2896 (diff) | |
| download | mariadb-git-2e7c3675194ada4924e09a06275e4268a3618d78.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
| -rw-r--r-- | sql/spatial.h | 4 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index acd16172fcc..ec5e80e00fd 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -240,8 +240,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; diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 5cd9d1646a4..7a1219736ae 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -249,6 +249,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --includedir=%{_includedir} \ --mandir=%{_mandir} \ --enable-thread-safe-client \ + --with-zlib-dir=bundled \ --with-readline ; # Add this for more debugging support # --with-debug |