bk commit into 5.1 tree (pkarthick:1.2265)

[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@stripped, 2006-08-08 11:17:34+05:30, pkarthick@stripped +3 -0
  pkarthick-5.1.12-beta.patch

  include/config-netware.h@stripped, 2006-06-12 12:57:19+05:30, pkarthick@stripped +1 -1
    Import patch pkarthick-5.1.12-beta.patch

  netware/BUILD/compile-AUTOTOOLS@stripped, 2006-06-12 12:57:19+05:30, pkarthick@stripped +3 -1
    Import patch pkarthick-5.1.12-beta.patch

  netware/BUILD/compile-netware-START@stripped, 2006-06-12 12:57:19+05:30, pkarthick@stripped +1 -1
    Import patch pkarthick-5.1.12-beta.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.6/netware/BUILD/compile-AUTOTOOLS	2006-08-08 11:17:39 +05:30
+++ 1.7/netware/BUILD/compile-AUTOTOOLS	2006-08-08 11:17:39 +05:30
@@ -5,6 +5,8 @@
 
 # stop on errors
 set -e
+sed -e "s/^DIST_COMMON/#DIST_COMMON/g" storage/ndb/Makefile.am > storage/ndb/Makefile.am.$$
+mv storage/ndb/Makefile.am.$$ storage/ndb/Makefile.am
 
 for package in . ./storage/innobase
 do
@@ -14,7 +16,7 @@
 	autoheader
 	libtoolize --force
 	aclocal
-	automake --add-missing --force-missing
+	automake --verbose --add-missing --force-missing
 	autoconf)
 done
 

--- 1.7/netware/BUILD/compile-netware-START	2006-08-08 11:17:39 +05:30
+++ 1.8/netware/BUILD/compile-netware-START	2006-08-08 11:17:39 +05:30
@@ -24,5 +24,5 @@
 	--prefix=N:/mysql \
 	--without-mysqlmanager \
 	--without-man \
-	--without-csv-storage-engine \
 	"
+#	--without-csv-storage-engine \

--- 1.16/include/config-netware.h	2006-08-08 11:17:39 +05:30
+++ 1.17/include/config-netware.h	2006-08-08 11:17:39 +05:30
@@ -42,6 +42,7 @@
 #include <sys/time.h>
 #include <pthread.h>
 #include <termios.h>
+#include <sys/select.h>
 
 #undef _EVENT_H_
 /* 
@@ -59,7 +60,6 @@
 #undef HAVE_SCHED_H
 #undef HAVE_SYS_MMAN_H
 #undef HAVE_SYNCH_H
-#undef HAVE_MMAP
 #undef HAVE_RINT
 
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1