Commit 81528c1a authored by dfischer/mysqldev@production.mysql.com's avatar dfischer/mysqldev@production.mysql.com
Browse files

Merge bk-internal:/home/bk/mysql-5.0-build 

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
parents 74afbb4b e8aa23fa

netware/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ link_sources: 
	set -x; \

	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

else
@@ -75,7 +75,7 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \ 
		mysqlshow.def mysqltest.def mysql_upgrade.def perror.def \

		mysql_client_test.def \

		replace.def resolve_stack_dump.def resolveip.def \

		static_init_db.sql \

		static_init_db.sql init_db.sql 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\

netware/isamchk.def

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------

# 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

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------

# 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

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------

# 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