bk commit into 4.0 tree (1.1474)

Below is the list of changes that have just been committed into a local
4.0 repository of greg. When greg 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1474 03/04/24 18:02:14 greg@xxxxxxxxx[greg] +22 -0
  rlyon-4.0.13.patch

  netware/BUILD/crontab
    1.1 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +4 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/cron-build
    1.1 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +46 -0
    Import patch rlyon-4.0.13.patch

  sql/sql_load.cc
    1.46 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +1 -1
    Import patch rlyon-4.0.13.patch

  sql/slave.cc
    1.219 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +0 -4
    Import patch rlyon-4.0.13.patch

  sql/mysqld.cc
    1.418 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +3 -5
    Import patch rlyon-4.0.13.patch

  sql/mini_client.cc
    1.51 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +1 -1
    Import patch rlyon-4.0.13.patch

  netware/Makefile.am
    1.7 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +20 -21
    Import patch rlyon-4.0.13.patch

  netware/BUILD/nwbootstrap
    1.4 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +10 -2
    Import patch rlyon-4.0.13.patch

  netware/BUILD/mwldnlm
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +3 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/mwccnlm
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +3 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/mwasmnlm
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +3 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/crontab
    1.0 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +0 -0
    BitKeeper file /home/greg/bk/tmp40/netware/BUILD/crontab

  netware/BUILD/cron-build
    1.0 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +0 -0
    BitKeeper file /home/greg/bk/tmp40/netware/BUILD/cron-build

  netware/BUILD/compile-netware-standard
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +7 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/compile-netware-debug
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +6 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/compile-netware-all
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +6 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/compile-netware-START
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +4 -1
    Import patch rlyon-4.0.13.patch

  netware/BUILD/compile-netware-END
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +6 -0
    Import patch rlyon-4.0.13.patch

  netware/BUILD/compile-linux-tools
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +4 -1
    Import patch rlyon-4.0.13.patch

  netware/BUILD/compile-AUTOTOOLS
    1.3 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +6 -0
    Import patch rlyon-4.0.13.patch

  mysys/my_pthread.c
    1.36 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +23 -0
    Import patch rlyon-4.0.13.patch

  mysys/mf_path.c
    1.9 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +3 -0
    Import patch rlyon-4.0.13.patch

  include/my_pthread.h
    1.62 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +5 -0
    Import patch rlyon-4.0.13.patch

  configure.in
    1.270 03/04/23 07:04:05 greg@xxxxxxxxx[greg] +1 -0
    Import patch rlyon-4.0.13.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: greg
# Host: gcw.(none)
# Root: /home/greg/bk/tmp40

--- 1.269/configure.in  Tue Mar 18 17:47:36 2003
+++ 1.270/configure.in  Wed Apr 23 07:04:05 2003
@@ -2637,6 +2637,7 @@
  include/Makefile sql-bench/Makefile tools/Makefile dnl
  tests/Makefile Docs/Makefile support-files/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
+ netware/Makefile dnl
  include/mysql_version.h dnl
  , , [
   test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h

--- 1.61/include/my_pthread.h   Fri Mar 21 16:45:37 2003
+++ 1.62/include/my_pthread.h   Wed Apr 23 07:04:05 2003
@@ -247,6 +247,11 @@
 #error Requires at least rev 2 of EMX pthreads library.
 #endif
 
+#ifdef __NETWARE__
+void my_pthread_exit(void *status);
+#define pthread_exit(A) my_pthread_exit(A)
+#endif
+
 extern int my_pthread_getprio(pthread_t thread_id);
 
 #define pthread_key(T,V) pthread_key_t V

--- 1.8/mysys/mf_path.c Thu Dec  6 07:10:41 2001
+++ 1.9/mysys/mf_path.c Wed Apr 23 07:04:05 2003
@@ -77,6 +77,9 @@
 #define F_OK 0
 #define PATH_SEP ';'
 #define PROGRAM_EXTENSION ".exe"
+#elif defined(__NETWARE__)
+#define PATH_SEP ';'
+#define PROGRAM_EXTENSION ".nlm"
 #else
 #define PATH_SEP ':'
 #endif

--- 1.35/mysys/my_pthread.c     Fri Mar 21 16:45:38 2003
+++ 1.36/mysys/my_pthread.c     Wed Apr 23 07:04:05 2003
@@ -90,6 +90,29 @@
 }
 #endif
 
+#ifdef __NETWARE__
+/*
+don't kill the LibC Reaper thread or the main thread
+*/
+#include <nks/thread.h>
+void my_pthread_exit(void *status)
+{
+#undef pthread_exit
+  NXThreadId_t tid = NXThreadGetId();
+  NXContext_t ctx;
+  char name[PATH_MAX] = "";
+
+  NXThreadGetContext(tid, &ctx);
+  NXContextGetName(ctx, name, PATH_MAX);
+
+  // "MYSQLD.NLM's LibC Reaper" or "MYSQLD.NLM's main thread"
+  // with a debug build of LibC the reaper can have different names
+  if (!strindex(name, "\'s"))
+  {
+    pthread_exit(status);
+  }
+}
+#endif
 
 /* Some functions for RTS threads, AIX, Siemens Unix and UnixWare 7
    (and DEC OSF/1 3.2 too) */

--- 1.50/sql/mini_client.cc     Sun Jan  5 13:18:47 2003
+++ 1.51/sql/mini_client.cc     Wed Apr 23 07:04:05 2003
@@ -243,7 +243,7 @@
 static int mc_sock_connect(my_socket s, const struct sockaddr *name,
                           uint namelen, uint to)
 {
-#if defined(__WIN__) || defined(OS2)
+#if defined(__WIN__) || defined(OS2) || defined(__NETWARE__)
   return connect(s, (struct sockaddr*) name, namelen);
 #else
   int flags, res, s_err;

--- 1.417/sql/mysqld.cc Wed Apr 23 17:09:42 2003
+++ 1.418/sql/mysqld.cc Wed Apr 23 07:04:05 2003
@@ -797,9 +797,9 @@
 
 #ifdef __NETWARE__
   pthread_join(select_thread, NULL);           // wait for main thread
-#else
-  pthread_exit(0);                             /* purecov: deadcode */
 #endif /* __NETWARE__ */
+  
+  pthread_exit(0);                             /* purecov: deadcode */
 
   RETURN_FROM_KILL_SERVER;
 }
@@ -856,13 +856,11 @@
 {
   clean_up(1);
   my_thread_end();
-#ifndef __NETWARE__
-#ifdef SIGNALS_DONT_BREAK_READ
+#if defined(SIGNALS_DONT_BREAK_READ) && !defined(__NETWARE__)
   exit(0);
 #else
   pthread_exit(0);                             // Exit is in main thread
 #endif
-#endif /* __NETWARE__ */
 }
 
 

--- 1.218/sql/slave.cc  Thu Apr  3 04:33:12 2003
+++ 1.219/sql/slave.cc  Wed Apr 23 07:04:05 2003
@@ -2355,9 +2355,7 @@
     goto slave_begin;
 #endif  
   my_thread_end();
-#ifndef __NETWARE__
   pthread_exit(0);
-#endif /* __NETWARE__ */
   DBUG_RETURN(0);                              // Can't return anything here
 }
 
@@ -2500,9 +2498,7 @@
     goto slave_begin;
 #endif  
   my_thread_end(); // clean-up before broadcasting termination
-#ifndef __NETWARE__
   pthread_exit(0);
-#endif /* __NETWARE__ */
   DBUG_RETURN(0);                              // Can't return anything here
 }
 

--- 1.45/sql/sql_load.cc        Wed Feb 26 17:06:08 2003
+++ 1.46/sql/sql_load.cc        Wed Apr 23 07:04:05 2003
@@ -179,7 +179,7 @@
     else
     {
       unpack_filename(name,ex->file_name);
-#if !defined(__WIN__) && !defined(OS2)
+#if !defined(__WIN__) && !defined(OS2) && ! defined(__NETWARE__)
       MY_STAT stat_info;
       if (!my_stat(name,&stat_info,MYF(MY_WME)))
        DBUG_RETURN(-1);
--- New file ---
+++ netware/BUILD/cron-build    03/04/23 07:04:05
#! /bin/sh

# debug
#set -x

# stop on errors
set -e

# repository direcotry
repo_dir=`pwd`

# show usage
show_usage()
{
        cat << EOF

usage: cron-patch

EOF
        exit 0;
}

echo "starting build..."

# check for bk and repo_dir
bk help > /dev/null
repo_dir=`bk root $repo_dir`
cd $repo_dir

# pull latest code
echo 'y' | bk pull

# determine version
version=`grep -e "AM_INIT_AUTOMAKE(mysql, .*)" < configure.in | sed -e 
"s/AM_INIT_AUTOMAKE(mysql, \(.*\))/\1/"`
echo "version: $version"

# latest revision
rev=`bk changes -e -n -d':REV:' | head -1`
echo "latest revision: $rev"

# run bootstrap
./netware/BUILD/nwbootstrap --revision=$rev --suffix=$rev --build=all

echo "done"



--- New file ---
+++ netware/BUILD/crontab       03/04/23 07:04:05
00 23 * * * (export PATH='/usr/local/bin:/usr/bin:/bin'; export DISPLAY=':0'; 
cd ~/bk/mysqldoc; echo 'y' | bk pull)
00 00 * * * (export PATH='/usr/local/bin:/usr/bin:/bin'; export DISPLAY=':0'; 
cd ~/bk/mysql-4.0; ./netware/BUILD/cron-build)
00 04 * * * (export PATH='/usr/local/bin:/usr/bin:/bin'; export DISPLAY=':0'; 
cd ~/bk/mysql-4.1; ./netware/BUILD/cron-build)



--- 1.2/netware/BUILD/compile-AUTOTOOLS Tue Mar  4 12:16:16 2003
+++ 1.3/netware/BUILD/compile-AUTOTOOLS Wed Apr 23 07:04:05 2003
@@ -1,5 +1,11 @@
 #! /bin/sh                   
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 for package in . ./innobase
 do
        (cd $package

--- 1.2/netware/BUILD/compile-linux-tools       Tue Mar  4 12:16:16 2003
+++ 1.3/netware/BUILD/compile-linux-tools       Wed Apr 23 07:04:05 2003
@@ -1,7 +1,10 @@
 #! /bin/sh                   
 
-#debug
+# debug
 #set -x
+
+# stop on errors
+set -e
 
 if test ! -r ./sql/mysqld.cc
 then

--- 1.2/netware/BUILD/compile-netware-END       Tue Mar  4 12:16:16 2003
+++ 1.3/netware/BUILD/compile-netware-END       Wed Apr 23 07:04:05 2003
@@ -1,5 +1,11 @@
 #! /bin/sh                   
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 path=`dirname $0`
 
 # clean

--- 1.2/netware/BUILD/compile-netware-START     Tue Mar  4 12:16:16 2003
+++ 1.3/netware/BUILD/compile-netware-START     Wed Apr 23 07:04:05 2003
@@ -1,7 +1,10 @@
 #! /bin/sh
 
-#debug
+# debug
 #set -x
+
+# stop on errors
+set -e
 
 if test ! -r ./sql/mysqld.cc
 then

--- 1.2/netware/BUILD/compile-netware-all       Tue Mar  4 12:16:16 2003
+++ 1.3/netware/BUILD/compile-netware-all       Wed Apr 23 07:04:05 2003
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 path=`dirname $0`
 
 $path/compile-netware-standard

--- 1.2/netware/BUILD/compile-netware-debug     Tue Mar  4 12:16:17 2003
+++ 1.3/netware/BUILD/compile-netware-debug     Wed Apr 23 07:04:05 2003
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 path=`dirname $0`
 . $path/compile-netware-START
 

--- 1.2/netware/BUILD/compile-netware-standard  Tue Mar  4 12:16:17 2003
+++ 1.3/netware/BUILD/compile-netware-standard  Wed Apr 23 07:04:05 2003
@@ -1,5 +1,12 @@
 #! /bin/sh
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
+
 path=`dirname $0`
 . $path/compile-netware-START
 

--- 1.2/netware/BUILD/mwasmnlm  Tue Mar  4 12:16:17 2003
+++ 1.3/netware/BUILD/mwasmnlm  Wed Apr 23 07:04:05 2003
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+# stop on errors
+set -e
+
 args=" $*"
 
 wine --debugmsg -all -- mwasmnlm $args

--- 1.2/netware/BUILD/mwccnlm   Tue Mar  4 12:16:17 2003
+++ 1.3/netware/BUILD/mwccnlm   Wed Apr 23 07:04:05 2003
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+# stop on errors
+set -e
+
 # mwccnlm is having a hard time understanding "-I./../include"
 # convert it to "-I../include"
 args=" "`echo $* | sed -e 's/-I.\/../-I../g'`

--- 1.2/netware/BUILD/mwldnlm   Tue Mar  4 12:16:17 2003
+++ 1.3/netware/BUILD/mwldnlm   Wed Apr 23 07:04:05 2003
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+# stop on errors
+set -e
+
 args=" $*"
 
 wine --debugmsg -all -- mwldnlm $args

--- 1.3/netware/BUILD/nwbootstrap       Fri Mar 21 15:43:36 2003
+++ 1.4/netware/BUILD/nwbootstrap       Wed Apr 23 07:04:05 2003
@@ -3,11 +3,11 @@
 # debug
 #set -x
 
-path=`dirname $0`
-
 # stop on errors
 set -e
 
+path=`dirname $0`
+
 # repository direcotry
 repo_dir=`pwd`
 
@@ -24,6 +24,7 @@
 revision=""
 rev=""
 build=""
+suffix=""
 mwenv=""
 
 # show usage
@@ -81,6 +82,7 @@
     --wine-build-dir=*) wine_build_dir=`echo "$arg" | sed -e 
"s;--wine-build-dir=;;"` ;;
     --revision=*) revision=`echo "$arg" | sed -e "s;--revision=;;"` ;;
     --build=*) build=`echo "$arg" | sed -e "s;--build=;;"` ;;
+    --suffix=*) suffix=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
     --doc-dir=*) doc_dir=`echo "$arg" | sed -e "s;--doc-dir=;;"` ;;
     *) show_usage ;;
   esac
@@ -110,6 +112,12 @@
 
 # build target directory
 target_dir="$build_dir/mysql-$version"
+
+# add suffix
+if test $suffix
+then
+  target_dir="$target_dir-$suffix"
+fi
 
 # delete any old target
 if test -d $target_dir.old; then rm -rf $target_dir.old; fi

--- 1.6/netware/Makefile.am     Fri Mar 21 15:43:36 2003
+++ 1.7/netware/Makefile.am     Wed Apr 23 07:04:05 2003
@@ -14,35 +14,34 @@
 #  along with this program; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-INCLUDES =                     -I$(srcdir)/../include -I../include -I..
-bin_PROGRAMS =                 mysqld_safe mysql_install_db mysql_test_run 
libmysql
-mysqld_safe_SOURCES=           mysqld_safe.c my_manage.c
+INCLUDES=                                                                      
-I$(srcdir)/../include -I../include -I..
+bin_PROGRAMS=                                                  mysqld_safe 
mysql_install_db mysql_test_run libmysql
+mysqld_safe_SOURCES=                   mysqld_safe.c my_manage.c
 mysql_install_db_SOURCES=      mysql_install_db.c my_manage.c
 mysql_test_run_SOURCES=                mysql_test_run.c my_manage.c
-libmysql_SOURCES=              libmysqlmain.c
-libmysql_LDADD =               ../libmysql/.libs/libmysqlclient.a
+libmysql_SOURCES=                                      libmysqlmain.c
+libmysql_LDADD=                                                
../libmysql/.libs/libmysqlclient.a
 
-netware_build_files =           client/mysql.def client/mysqladmin.def \
-                                client/mysqlbinlog.def client/mysqlcheck.def \
-                                client/mysqldump.def client/mysqlimport.def \
-                                client/mysqlshow.def client/mysqltest.def \
-                                extra/mysql_install.def 
extra/my_print_defaults.def \
-                                extra/perror.def extra/replace.def \
-                                extra/resolveip.def extra/comp_err.def \
-                                                                               
                                                isam/isamchk.def \
-                                isam/isamlog.def isam/pack_isam.def \
-                                libmysqld/libmysqld.def myisam/myisamchk.def \
-                                myisam/myisamlog.def myisam/myisampack.def \
-                                sql/mysqld.def
+netware_build_files =  client/mysql.def client/mysqladmin.def \
+                                                                               
        client/mysqlbinlog.def client/mysqlcheck.def \
+                                                                               
        client/mysqldump.def client/mysqlimport.def \
+                                                                               
        client/mysqlshow.def client/mysqltest.def \
+                                                                               
        extra/mysql_install.def extra/my_print_defaults.def \
+                                                                               
        extra/perror.def extra/replace.def \
+                                                                               
        extra/resolveip.def extra/comp_err.def \
+                                                                               
        isam/isamchk.def \
+                                                                               
        isam/isamlog.def isam/pack_isam.def \
+                                                                               
        libmysqld/libmysqld.def myisam/myisamchk.def \
+                                                                               
        myisam/myisamlog.def myisam/myisampack.def \
+                                                                               
        sql/mysqld.def
                                                                                
                                                
 link_sources:
        set -x; \
        for f in $(netware_build_files); do \
-         rm -f $(srcdir)/../$$f; \
-         org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
-         @LN_CP_F@ $(srcdir)/$$org $(srcdir)/../$$f; \
+               rm -f $(srcdir)/../$$f; \
+               org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
+               @LN_CP_F@ $(srcdir)/$$org $(srcdir)/../$$f; \
        done;
-
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx