bk commit into 5.0 tree (SergeyV:1.2003)

[sergeyv]

Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2003 06/01/23 21:35:11 SergeyV@selena. +3 -0
  Changes after initial patch to #15787

  zlib/zconf.h
    1.7 06/01/23 21:34:56 SergeyV@selena. +1 -1
    restored a code for standard platform dependant definitions

  zlib/README.MySQL
    1.2 06/01/23 21:34:56 SergeyV@selena. +9 -0
    Updated a readme file to emphasize which files we what to keep an eye on
    in case of zlib upgrade.

  zlib/Makefile.am
    1.7 06/01/23 21:34:55 SergeyV@selena. +2 -0
    Added a reference to ../include for my_config.h

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#15787-mysql-5.0

--- 1.1/zlib/README.MySQL	2005-08-09 21:22:44 +04:00
+++ 1.2/zlib/README.MySQL	2006-01-23 21:34:56 +03:00
@@ -5,3 +5,12 @@
   http://www.gzip.org/zlib/ 
   or
   http://www.zlib.net/
+
+Revision history:
+
+20.01.2006. The following files were changed as part of #15787 fix:
+ makefile.am
+ gzio.c
+ zconf.h
+ README.mysql
+

--- 1.6/zlib/Makefile.am	2005-12-15 18:59:29 +03:00
+++ 1.7/zlib/Makefile.am	2006-01-23 21:34:55 +03:00
@@ -16,6 +16,8 @@
 
 # Process this file with automake to create Makefile.in
 
+INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include
+
 pkglib_LTLIBRARIES=libz.la
 
 libz_la_LDFLAGS= -version-info 3:3:2

--- 1.6/zlib/zconf.h	2006-01-12 17:25:01 +03:00
+++ 1.7/zlib/zconf.h	2006-01-23 21:34:56 +03:00
@@ -288,7 +288,7 @@
    typedef Byte       *voidp;
 #endif
 
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#ifdef HAVE_UNISTD_H
 #  include <sys/types.h> /* for off_t */
 #  include <unistd.h>    /* for SEEK_* and off_t */
 #  ifdef VMS