rlyon-5.0.0-alpha.patch

client/mysql.cc:
  Import patch rlyon-5.0.0-alpha.patch
configure.in:
  Import patch rlyon-5.0.0-alpha.patch
include/config-netware.h:
  Import patch rlyon-5.0.0-alpha.patch
include/my_global.h:
  Import patch rlyon-5.0.0-alpha.patch
include/my_pthread.h:
  Import patch rlyon-5.0.0-alpha.patch
mysys/my_pthread.c:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-AUTOTOOLS:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-linux-tools:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-END:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-START:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-all:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-debug:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-standard:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwasmnlm:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwccnlm:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwenv:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwldnlm:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/nwbootstrap:
  Import patch rlyon-5.0.0-alpha.patch
netware/Makefile.am:
  Import patch rlyon-5.0.0-alpha.patch
netware/mysql_test_run.c:
  Import patch rlyon-5.0.0-alpha.patch
scripts/make_binary_distribution.sh:
  Import patch rlyon-5.0.0-alpha.patch
sql/mysqld.cc:
  Import patch rlyon-5.0.0-alpha.patch
sql/slave.cc:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-src:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/cron-build:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/crontab:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/knetware.imp:
  Import patch rlyon-5.0.0-alpha.patch

18 files changed, 201 insertions, 31 deletions

diff --git a/netware/BUILD/compile-AUTOTOOLS b/netware/BUILD/compile-AUTOTOOLS
index 0688ea5aaca..57213b1b3d0 100755
--- a/netware/BUILD/compile-AUTOTOOLS
+++ b/netware/BUILD/compile-AUTOTOOLS
@@ -1,5 +1,11 @@
 #! /bin/sh                   
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 for package in . ./innobase
 do
 	(cd $package
diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 598be96ab66..3590a900338 100755
--- a/netware/BUILD/compile-linux-tools
+++ b/netware/BUILD/compile-linux-tools
@@ -1,8 +1,11 @@
 #! /bin/sh                   
 
-#debug
+# debug
 #set -x
 
+# stop on errors
+set -e
+
 if test ! -r ./sql/mysqld.cc
 then
   echo "you must start from the top source directory"
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END
index beb15fbeda3..19d24ff8c6f 100755
--- a/netware/BUILD/compile-netware-END
+++ b/netware/BUILD/compile-netware-END
@@ -1,5 +1,11 @@
 #! /bin/sh                   
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 path=`dirname $0`
 
 # clean
@@ -23,7 +29,7 @@ rm -rf Makefile.in.bk
 make clean bin-dist
 
 # mark the build
-for file in *.tar.gz
+for file in *.tar.gz *.zip
 do
 	if (expr "$file" : "mysql-[1-9].*" > /dev/null)
 	then
diff --git a/netware/BUILD/compile-netware-START b/netware/BUILD/compile-netware-START
index 2941d8868e4..7eef192a907 100755
--- a/netware/BUILD/compile-netware-START
+++ b/netware/BUILD/compile-netware-START
@@ -1,8 +1,11 @@
 #! /bin/sh
 
-#debug
+# debug
 #set -x
 
+# stop on errors
+set -e
+
 if test ! -r ./sql/mysqld.cc
 then
   echo "you must start from the top source directory"
diff --git a/netware/BUILD/compile-netware-all b/netware/BUILD/compile-netware-all
index f8dea0f7583..6baff699e94 100755
--- a/netware/BUILD/compile-netware-all
+++ b/netware/BUILD/compile-netware-all
@@ -1,7 +1,14 @@
 #! /bin/sh
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 path=`dirname $0`
 
+$path/compile-netware-src
 $path/compile-netware-standard
 $path/compile-netware-debug
 #$path/compile-netware-max
diff --git a/netware/BUILD/compile-netware-debug b/netware/BUILD/compile-netware-debug
index 2cd292c82fd..e44d64e3074 100755
--- a/netware/BUILD/compile-netware-debug
+++ b/netware/BUILD/compile-netware-debug
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
 path=`dirname $0`
 . $path/compile-netware-START
 
diff --git a/netware/BUILD/compile-netware-src b/netware/BUILD/compile-netware-src
new file mode 100644
index 00000000000..df7f6fcdd1a
--- /dev/null
+++ b/netware/BUILD/compile-netware-src
@@ -0,0 +1,36 @@
+#! /bin/sh                   
+
+# debug
+#set -x
+
+# stop on errors
+set -e
+
+if test ! -r ./sql/mysqld.cc
+then
+  echo "you must start from the top source directory"
+  exit 1
+fi
+
+path=`dirname $0`
+
+# clean
+if test -e "Makefile"; then
+	make -k clean;
+	make -k distclean;
+fi
+
+# remove other files
+rm -f NEW-RPMS/*
+rm -f */.deps/*.P
+rm -rf Makefile.in.bk
+
+# zip source
+files=`pwd | sed -e "s/.*\\\(mysql-.*\)/\1/"`
+file=`pwd | sed -e "s/.*\\mysql-\(.*\)/mysql-src-\1-pc-netware-i686/"`
+cd ..
+if test -e "$file.zip"; then rm -f $file.zip; fi
+zip -r $file.zip $files -x \*.zip -x \*.tar.gz
+if test -e "./$files/$file.zip"; then mv -f ./$files/$file.zip ./$files/$file.zip.old; fi
+mv -f $file.zip ./$files/$file.zip
+
diff --git a/netware/BUILD/compile-netware-standard b/netware/BUILD/compile-netware-standard
index c09337b5fe0..45f5021862c 100755
--- a/netware/BUILD/compile-netware-standard
+++ b/netware/BUILD/compile-netware-standard
@@ -1,12 +1,19 @@
 #! /bin/sh
 
+# debug
+#set -x
+
+# stop on errors
+set -e
+
+
 path=`dirname $0`
 . $path/compile-netware-START
 
 suffix="standard"
 
 extra_configs=" \
-	--with-innodb
+	--with-innodb \
 	"
 
 . $path/compile-netware-END
diff --git a/netware/BUILD/cron-build b/netware/BUILD/cron-build
new file mode 100644
index 00000000000..26ccde28e2a
--- /dev/null
+++ b/netware/BUILD/cron-build
@@ -0,0 +1,46 @@
+#! /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"
+
+
diff --git a/netware/BUILD/crontab b/netware/BUILD/crontab
new file mode 100644
index 00000000000..0097f8acaaf
--- /dev/null
+++ b/netware/BUILD/crontab
@@ -0,0 +1,4 @@
+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)
+
diff --git a/netware/BUILD/knetware.imp b/netware/BUILD/knetware.imp
new file mode 100644
index 00000000000..d9a9372b34f
--- /dev/null
+++ b/netware/BUILD/knetware.imp
@@ -0,0 +1,2 @@
+kYieldIfTimeSliceUp
+
diff --git a/netware/BUILD/mwasmnlm b/netware/BUILD/mwasmnlm
index c3501112aa5..381f84ec0c8 100755
--- a/netware/BUILD/mwasmnlm
+++ b/netware/BUILD/mwasmnlm
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+# stop on errors
+set -e
+
 args=" $*"
 
 wine --debugmsg -all -- mwasmnlm $args
diff --git a/netware/BUILD/mwccnlm b/netware/BUILD/mwccnlm
index 9e989485bd9..cb2d62fe8cf 100755
--- a/netware/BUILD/mwccnlm
+++ b/netware/BUILD/mwccnlm
@@ -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'`
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index 27f7056d251..4445bc5b2e5 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -7,8 +7,8 @@
 export MYDEV="WINE_BUILD_DIR"
 
 export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/zlib-1.1.4"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4"
-export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a"
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/mysql-VERSION/netware/BUILD;$MYDEV/zlib-1.1.4"
+export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;knetware.imp;libz.a"
 
 export WINEPATH="$MYDEV/mw/bin"
 
@@ -19,9 +19,9 @@ export AR='mwldnlm'
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-dialect c -proc 686 -relax_pointers'
+export CFLAGS='-align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-dialect c++ -proc 686 -bool on -wchar_t on -relax_pointers -D_WCHAR_T'
+export CXXFLAGS='-align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
 export LD='mwldnlm'
 export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -flags pseudopreemption'
 export RANLIB=:
diff --git a/netware/BUILD/mwldnlm b/netware/BUILD/mwldnlm
index 7ad2872ccbb..28566fc5cb1 100755
--- a/netware/BUILD/mwldnlm
+++ b/netware/BUILD/mwldnlm
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+# stop on errors
+set -e
+
 args=" $*"
 
 wine --debugmsg -all -- mwldnlm $args
diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap
index 002e19c8e49..43b61d5254d 100755
--- a/netware/BUILD/nwbootstrap
+++ b/netware/BUILD/nwbootstrap
@@ -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 @@ temp_dir=""
 revision=""
 rev=""
 build=""
+suffix=""
 mwenv=""
 
 # show usage
@@ -81,6 +82,7 @@ for arg do
     --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
@@ -111,6 +113,12 @@ echo "version: $version"
 # 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
 
@@ -139,10 +147,12 @@ then
 fi
 
 # make files writeable
+echo "making files writable..."
 cd $target_dir
 chmod -R u+rw,g+rw .
 
 # edit the mvenv file
+echo "updating the mwenv environment file..."
 mwenv="./netware/BUILD/mwenv"
 mv -f $mwenv $mwenv.org
 sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
@@ -150,6 +160,17 @@ sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
   -e "s;VERSION;$version;g" $mwenv.org > $mwenv
 chmod +rwx $mwenv
 
+#edit the def file versions
+echo "updating *.def file versions..."
+nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1, \2, \3;"`
+
+for file in ./netware/*.def
+do
+mv -f $file $file.org
+sed -e "s;VERSION.*;VERSION $nlm_version;g" $file.org > $file 
+rm $file.org
+done
+
 # build linux tools
 echo "compiling linux tools..."
 ./netware/BUILD/compile-linux-tools
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 6495f538ffb..e4b9a14ecf0 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -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.%
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index ff629546793..8bf0b7e0016 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -266,6 +266,7 @@ void start_master()
   int err, i;
   char master_out[PATH_MAX];
   char master_err[PATH_MAX];
+  char temp[PATH_MAX];
   
   // remove old berkeley db log files that can confuse the server
   removef("%s/log.*", master_dir);
@@ -289,6 +290,20 @@ void start_master()
   if (master_init_script[0] != NULL)
   {
     // run_init_script(master_init_script);
+    
+    // TODO: use the scripts
+    if (strindex(master_init_script, "repair_part2-master.sh") != NULL)
+    {
+      FILE *fp;
+      
+      // create an empty index file
+      snprintf(temp, PATH_MAX, "%s/test/t1.MYI", master_dir);
+      fp = fopen(temp, "wb+");
+      
+      fputs("1", fp);
+
+      fclose(fp);
+    }
   }
 
   // redirection files