Merge mysql.com:/home/cps/mysql/trees/mysql-4.1

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin


sql/examples/ha_tina.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

support-files/mysql.spec.sh

@@ -259,6 +259,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