bk commit into 5.0 tree (kent:1.2175)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.2175 06/06/17 00:30:02 kent@stripped +3 -0
  configure.in, net_serv.cc, compile-netware-END:
    Changes for Netware

  netware/BUILD/compile-netware-END
    1.8 06/06/17 00:24:35 kent@stripped +0 -5
    After correcting "configure.in" to edit make files correctly,
    removed obsolete "sed" of "extra/Makefile.am" for Netware

  configure.in
    1.394 06/06/17 00:23:25 kent@stripped +3 -3
    Call of "comp_err" has moved, changed code for Netware that
    edits make files to reflect this

  sql/net_serv.cc
    1.89 06/06/17 00:20:03 kent@stripped +4 -0
    Netware needs <sys/select.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:	kent
# Host:	c-6a4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new

--- 1.393/configure.in	2006-06-15 14:37:40 +02:00
+++ 1.394/configure.in	2006-06-17 00:23:25 +02:00
@@ -1137,7 +1137,7 @@
     # Edit Makefile.in files.
     #
     echo -n "configuring Makefile.in files for NetWare... "
-    for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in sql/share/Makefile.in strings/Makefile.in client/Makefile.in
+    for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in extra/Makefile.in strings/Makefile.in client/Makefile.in
     do
     # echo "#### $file ####"
       filedir="`dirname $file`"
@@ -1163,9 +1163,9 @@
 s%\(mysqld_DEPENDENCIES = \) %\1$lib_DEPENDENCIES %
 EOF
           ;;
-        sql/share/Makefile.in)
+        extra/Makefile.in)
           cat > $filesed << EOF
-s,\(extra/comp_err\),\1.linux,
+s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
 EOF
           ;;
         libmysql/Makefile.in)

--- 1.88/sql/net_serv.cc	2006-03-02 10:55:51 +01:00
+++ 1.89/sql/net_serv.cc	2006-06-17 00:20:03 +02:00
@@ -52,6 +52,10 @@
 #include <signal.h>
 #include <errno.h>
 
+#ifdef __NETWARE__
+#include <sys/select.h>
+#endif
+
 #ifdef EMBEDDED_LIBRARY
 #undef MYSQL_SERVER
 #undef MYSQL_CLIENT

--- 1.7/netware/BUILD/compile-netware-END	2005-10-28 10:48:09 +02:00
+++ 1.8/netware/BUILD/compile-netware-END	2006-06-17 00:24:35 +02:00
@@ -21,11 +21,6 @@
 # run auto tools
 . $path/compile-AUTOTOOLS
 
-# For NetWare there is no comp_err but comp_err.linux
-sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
-sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ > extra/Makefile.am
-rm extra/Makefile.am.$$
-
 # configure
 ./configure $base_configs $extra_configs