bk commit into 5.1 tree (pkarthick:1.2074)

[pkarthick]

Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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.2074 06/01/18 15:20:06 pkarthick@stripped[prem] +3 -0
  5.1_new-libc-zlib.patch

  netware/my_manage.h
    1.5 06/01/04 11:36:45 pkarthick@stripped[prem] +1 -0
    Import patch 5.1_new-libc-zlib.patch

  netware/BUILD/mwenv
    1.13 06/01/04 11:36:45 pkarthick@stripped[prem] +3 -3
    Import patch 5.1_new-libc-zlib.patch

  include/config-netware.h
    1.15 06/01/04 11:36:45 pkarthick@stripped[prem] +7 -0
    Import patch 5.1_new-libc-zlib.patch

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1

--- 1.12/netware/BUILD/mwenv	2005-10-13 20:53:47 +05:30
+++ 1.13/netware/BUILD/mwenv	2006-01-04 11:36:45 +05:30
@@ -4,10 +4,10 @@
 # This values are normally changed by the nwbootstrap script
 
 # the default is "F:/mydev"
-export MYDEV="F:/mydev"
+export MYDEV=WINE_BUILD_DIR
 
-export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/include;$MYDEV"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"
+export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$MYDEV/mysql-VERSION/include;$MYDEV"
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$MYDEV/mysql-VERSION/netware/BUILD"
 export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"
 
 export WINEPATH="$MYDEV/mw/bin"

--- 1.4/netware/my_manage.h	2004-05-26 19:40:52 +05:30
+++ 1.5/netware/my_manage.h	2006-01-04 11:36:45 +05:30
@@ -55,6 +55,7 @@
 
 #define ARG_BUF			10
 #define TRY_MAX			5
+#define NULL        (char )0
 
 #ifdef __NETWARE__
 #define strstr(A,B) strindex(A,B)

--- 1.14/include/config-netware.h	2006-01-12 23:37:03 +05:30
+++ 1.15/include/config-netware.h	2006-01-04 11:36:45 +05:30
@@ -65,6 +65,13 @@
 #undef HAVE_STPCPY
 /* changes  end  */
 
+/* Changes made to make use of LibC-June-2005 for building purpose */
+#undef HAVE_GETPASS
+#undef HAVE_GETRLIMIT
+#undef HAVE_GETRUSAGE
+#undef HAVE_INITGROUPS
+/* Changes  end  - LibC-June-2005 */
+
 /* no libc crypt() function */
 #ifdef HAVE_OPENSSL
   #define HAVE_CRYPT 1