Merge trift2.:/MySQL/M51/netware-5.1

into  trift2.:/MySQL/M51/push-5.1


netware/Makefile.am:
  Auto merged

netware/Makefile.am

@@ -46,7 +46,7 @@ netware_build_files =           client/mysql.def client/mysqladmin.def \
 link_sources:
 	for f in $(netware_build_files); do \
 	  rm -f ../$$f; \
-	  org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
+	  org=`basename $$f`; \
 	  @LN_CP_F@ $(srcdir)/$$org ../$$f; \
 	done
 	echo timestamp > link_sources

netware/isamchk.def

-#------------------------------------------------------------------------------
-# ISAM Check
-#------------------------------------------------------------------------------
-MODULE	libc.nlm
-SCREENNAME "MySQL ISAM Table Check Tool"
-COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
-DESCRIPTION "MySQL ISAM Table Check Tool"
-VERSION 4, 0
-STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
-#DEBUG
-

netware/isamlog.def

-#------------------------------------------------------------------------------
-# ISAM Log
-#------------------------------------------------------------------------------
-MODULE	libc.nlm
-COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
-DESCRIPTION "MySQL ISAM Table Log Tool"
-VERSION 4, 0
-STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
-#DEBUG
-

netware/pack_isam.def

-#------------------------------------------------------------------------------
-# Pack ISAM
-#------------------------------------------------------------------------------
-MODULE	libc.nlm
-SCREENNAME "MySQL ISAM Table Pack Tool"
-COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
-DESCRIPTION "MySQL ISAM Table Pack Tool"
-SCREENNAME "MySQL ISAM Table Pack Tool"
-VERSION 4, 0
-STACKSIZE 131072
-XDCDATA ../netware/mysql.xdc
-#DEBUG
-