Merge with 4.0.11

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
bdb/os/os_handle.c:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
mysql-test/t/func_crypt.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
Docs/manual.texi:
  Use remote version
client/mysql.cc:
  Merge
configure.in:
  Merge
libmysql/libmysql.c:
  Merge
libmysqld/lib_sql.cc:
  Merge
myisam/ft_stopwords.c:
  Merge
myisam/myisamchk.c:
  Merge
mysql-test/r/bigint.result:
  Merge
mysql-test/r/group_by.result:
  Merge
mysql-test/r/rpl000009.result:
  Merge
mysql-test/t/group_by.test:
  Merge
mysql-test/t/rpl000009.test:
  Merge
mysql-test/t/rpl_rotate_logs.test:
  Merge
mysys/Makefile.am:
  Merge
mysys/charset.c:
  Merge
sql/item.h:
  Merge
sql/item_cmpfunc.cc:
  Merge
sql/item_cmpfunc.h:
  Merge
sql/item_create.cc:
  Merge
sql/item_func.cc:
  Merge
sql/item_strfunc.h:
  Merge
sql/log.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/mysqld.cc:
  Merge
sql/protocol.cc:
  Merge
sql/slave.cc:
  Merge
sql/sql_class.h:
  Merge
sql/sql_db.cc:
  Merge
sql/sql_handler.cc:
  Merge
sql/sql_parse.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_yacc.yy:
  Merge

2 files changed, 107 insertions, 41 deletions

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index c2b1a0cb2b3..0773ccc679c 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -46,16 +46,37 @@ if [ -d $BASE ] ; then
  rm -r -f $BASE
 fi
 
+BS=""
+EXTRA_BIN_FILES=""
+BASE_SYSTEM="any"
+MYSQL_SHARE=$BASE/share/mysql
+
+case $system in
+  *netware*)
+    BASE_SYSTEM="netware"
+    BS=".nlm"
+    MYSQL_SHARE=$BASE/share
+    EXTRA_BIN_FILES="netware/mysqld_safe.nlm netware/mysql_install_db.nlm \
+      netware/init_db.sql netware/test_db.sql netware/mysql_explain_log.nlm \
+      netware/mysqlhotcopy.nlm netware/libmysql.nlm"
+    ;;
+esac
+
+
 mkdir $BASE $BASE/bin $BASE/data $BASE/data/mysql $BASE/data/test \
- $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/share/mysql \
- $BASE/tests $BASE/scripts $BASE/sql-bench $BASE/mysql-test \
- $BASE/mysql-test/t  $BASE/mysql-test/r \
- $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/man $BASE/man/man1
- 
+ $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
+ $BASE/mysql-test $BASE/mysql-test/t  $BASE/mysql-test/r \
+ $BASE/mysql-test/include $BASE/mysql-test/std_data
+
+if [ $BASE_SYSTEM != "netware" ] ; then
+  mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man $BASE/man/man1
+fi
+
 chmod o-rwx $BASE/data $BASE/data/*
 
 for i in ChangeLog COPYING COPYING.LIB README Docs/INSTALL-BINARY \
-         MySQLEULA.txt Docs/manual.html Docs/manual.txt Docs/manual_toc.html
+         MySQLEULA.txt Docs/manual.html Docs/manual.txt Docs/manual_toc.html \
+         LICENSE.doc README.NW Docs/mysqlbug.txt
 do
   if [ -f $i ]
   then
@@ -63,18 +84,23 @@ do
   fi
 done
 
-for i in extra/comp_err extra/replace extra/perror extra/resolveip \
-  extra/my_print_defaults extra/resolve_stack_dump \
-  isam/isamchk isam/pack_isam myisam/myisamchk \
-  myisam/myisampack sql/mysqld client/mysqlbinlog \
-  client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \
-  client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
-  client/mysqlmanagerc client/mysqlmanager-pwgen tools/mysqlmanager \
-  client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
-  client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \
-  client/.libs/mysqlcheck client/.libs/mysqlbinlog \
-  client/.libs/mysqlmanagerc client/.libs/mysqlmanager-pwgen \
-  tools/.libs/mysqlmanager
+for i in extra/comp_err$BS extra/replace$BS extra/perror$BS \
+         extra/resolveip$BS extra/my_print_defaults$BS \
+         extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
+        isam/isamchk$BS isam/pack_isam$BS \
+        myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \
+        sql/mysqld$BS \
+        client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
+	client/mysqldump$BS client/mysqlimport$BS \
+        client/mysqltest$BS client/mysqlcheck$BS \
+        client/mysqlbinlog$BS client/mysqlmanagerc$BS \
+        client/mysqlmanager-pwgen$BS tools/mysqlmanager$BS \
+        client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
+        client/.libs/mysqldump client/.libs/mysqlimport \
+        client/.libs/mysqltest client/.libs/mysqlcheck \
+        client/.libs/mysqlbinlog client/.libs/mysqlmanagerc \
+        client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager \
+        $EXTRA_BIN_FILES
 do
   if [ -f $i ]
   then
@@ -86,6 +112,7 @@ if [ x$STRIP = x1 ] ; then
   strip $BASE/bin/*
 fi
 
+# Copy not binary files
 for i in sql/mysqld.sym.gz
 do
   if [ -f $i ]
@@ -94,7 +121,11 @@ do
   fi
 done
 
-for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a
+if [ $BASE_SYSTEM = "netware" ] ; then
+    $CP -r netware/scripts/* $BASE/scripts
+fi
+
+for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a netware/libmysql.imp
 do
   if [ -f $i ]
   then
@@ -102,39 +133,72 @@ do
    fi
 done
 
+# convert the libs to .lib for NetWare
+if [ $BASE_SYSTEM = "netware" ] ; then
+    for i in $BASE/lib/*.a
+    do
+      libname=`basename $i .a`
+      $MV $i $BASE/lib/$libname.lib
+    done
+fi
+
 $CP config.h include/* $BASE/include
-rm $BASE/include/Makefile*; rm $BASE/include/*.in
+rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h
+if [ $BASE_SYSTEM != "netware" ] ; then
+  rm -f $BASE/include/config-netware.h
+fi
 
-$CP tests/*.res tests/*.tst tests/*.pl $BASE/tests
+if [ -d tests ] ; then
+  $CP tests/*.res tests/*.tst tests/*.pl $BASE/tests
+fi
+if [ -d man ] ; then
+  $CP man/*.1 $BASE/man/man1
+fi
 $CP support-files/* $BASE/support-files
-$CP man/*.1 $BASE/man/man1
 
-$CP -r sql/share/* $BASE/share/mysql
-rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD
+if [ $BASE_SYSTEM = "netware" ] ; then
+  rm -f $BASE/support-files/magic \
+        $BASE/support-files/mysql.server \
+        $BASE/support-files/mysql*.spec \
+        $BASE/support-files/mysql-log-rotate \
+        $BASE/support-files/binary-configure
+fi
+
+$CP -r sql/share/* $MYSQL_SHARE
+rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD
+
+for i in mysql-test/mysql-test-run mysql-test/install_test_db \
+         mysql-test/README \
+         netware/mysql_test_run.nlm netware/install_test_db.ncf
+do
+  if [ -f $i ]
+  then
+    $CP $i $BASE/mysql-test
+   fi
+done
 
-$CP mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/
-$CP mysql-test/README $BASE/mysql-test/README
 $CP mysql-test/include/*.inc $BASE/mysql-test/include
 $CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data
-$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t
-$CP mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r
+$CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t
+$CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r
+
+if [ $BASE_SYSTEM != "netware" ] ; then
+  $CP scripts/* $BASE/bin
+  $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
+  $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
+  $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe
+  mv $BASE/support-files/binary-configure $BASE/configure
+  chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/support-files/mysql.server $BASE/configure
+  $CP -r sql-bench/* $BASE/sql-bench
+  rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la
+fi
 
-$CP scripts/* $BASE/bin
 rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
 
-$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
-$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
-$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe
-
 # Make safe_mysqld a symlink to mysqld_safe for backwards portability
 # To be removed in MySQL 4.1
 (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
 
-mv $BASE/support-files/binary-configure $BASE/configure
-chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/support-files/mysql.server $BASE/configure
-$CP -r sql-bench/* $BASE/sql-bench
-rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la
-
 # Clean up if we did this from a bk tree
 if [ -d $BASE/sql-bench/SCCS ] ; then 
   find $BASE/share -name SCCS -print | xargs rm -r -f
@@ -196,7 +260,7 @@ which_1 ()
 # Create the result tar file
 #
 
-tar=`which_1 gtar`
+tar=`which_1 gnutar gtar`
 if test "$?" = "1" -o "$tar" = ""
 then
   tar=tar
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index febc7b8e595..0e9f4de09fe 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -47,11 +47,13 @@ parse_arguments() {
 
       # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
       --ledir=*)   ledir=`echo "$arg" | sed -e "s;--ledir=;;"` ;;
+      # err-log should be removed in 5.0
       --err-log=*) err_log=`echo "$arg" | sed -e "s;--err-log=;;"` ;;
-      # QQ The --open-files should be removed
+      --log-error=*) err_log=`echo "$arg" | sed -e "s;--log-error=;;"` ;;
+      # QQ The --open-files should be removed in 5.0
       --open-files=*) open_files=`echo "$arg" | sed -e "s;--open-files=;;"` ;;
       --open-files-limit=*) open_files=`echo "$arg" | sed -e "s;--open-files-limit=;;"` ;;
-      --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core_file_size=;;"` ;;
+      --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core-file-size=;;"` ;;
       --timezone=*) TZ=`echo "$arg" | sed -e "s;--timezone=;;"` ; export TZ; ;;
       --mysqld=*)   MYSQLD=`echo "$arg" | sed -e "s;--mysqld=;;"` ;;
       --mysqld-version=*)