Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck

sql/spatial.h

@@ -240,7 +240,7 @@ 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,
+  static int create_from_wkb(Geometry_buffer *buffer,
                              const char *wkb, uint32 len, String *res);
   int as_wkt(String *wkt, const char **end)
   {

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