Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1

Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged

4 files changed, 29 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index 4e4c2da8082..aca5d4bade7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS =		. include @docs_dirs@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests SSL\
-			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
+			BUILD netware os2 @libmysqld_dirs@ \
 			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 
 # Relink after clean
diff --git a/client/mysqldump.c b/client/mysqldump.c
index afeed2e03fd..2b40264325f 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1405,7 +1405,7 @@ static void dumpTable(uint numFields, char *table)
     if (opt_lock)
       fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);
 
-    total_length=net_buffer_length;		/* Force row break */
+    total_length= opt_net_buffer_length;		/* Force row break */
     row_break=0;
     rownr=0;
     init_length=(uint) strlen(insert_pat)+4;
@@ -1550,7 +1550,7 @@ static void dumpTable(uint numFields, char *table)
 	ulong row_length;
 	dynstr_append(&extended_row,")");
         row_length = 2 + extended_row.length;
-        if (total_length + row_length < net_buffer_length)
+        if (total_length + row_length < opt_net_buffer_length)
         {
 	  total_length += row_length;
 	  fputc(',',md_result_file);		/* Always row break */
diff --git a/configure.in b/configure.in
index 2017a6172fc..c00bbf60b60 100644
--- a/configure.in
+++ b/configure.in
@@ -2655,6 +2655,7 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
 fi
 AC_SUBST(netware_dir)
 AC_SUBST(linked_netware_sources)
+AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
 
 if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
 then
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 1f0277ef20e..5ef71301574 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -14,6 +14,7 @@
 #  along with this program; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+if HAVE_NETWARE
 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
@@ -43,7 +44,30 @@ link_sources:
 	  org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
 	  @LN_CP_F@ $(srcdir)/$$org $(srcdir)/../$$f; \
 	done;
-
+else
+EXTRA_DIST=	comp_err.def init_db.sql install_test_db.ncf \
+		isamchk.def isamlog.def libmysql.def libmysql.imp \
+		libmysqlmain.c my_manage.c my_manage.h \
+		my_print_defaults.def myisam_ftdump.def myisamchk.def \
+		myisamlog.def myisampack.def mysql.def mysql.xdc \
+		mysql_fix_privilege_tables.pl mysql_install.def \
+		mysql_install_db.c mysql_install_db.def \
+		mysql_secure_installation.pl mysql_test_run.c \
+		mysql_test_run.def mysql_waitpid.def mysqladmin.def \
+		mysqlbinlog.def mysqlcheck.def mysqld.def \
+		mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \
+		mysqlshow.def mysqltest.def pack_isam.def perror.def \
+		replace.def resolve_stack_dump.def resolveip.def test_db.sql \
+		BUILD/apply-patch BUILD/compile-AUTOTOOLS \
+		BUILD/compile-linux-tools BUILD/compile-netware-END \
+		BUILD/compile-netware-START BUILD/compile-netware-all\
+		BUILD/compile-netware-debug BUILD/compile-netware-max \
+		BUILD/compile-netware-max-debug BUILD/compile-netware-src \
+		BUILD/compile-netware-standard BUILD/create-patch \
+		BUILD/cron-build BUILD/crontab BUILD/knetware.imp \
+		BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \
+		BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch
+endif
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%