Commit 30435b43 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents c70dbeab 53114c70

netware/Makefile.am

+1 −1
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

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

scripts/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ bin_SCRIPTS = @server_scripts@ \ 


noinst_SCRIPTS =	make_binary_distribution \

			make_sharedlib_distribution \

			make_win_src_distribution

			make_win_src_distribution_old



EXTRA_SCRIPTS =		make_binary_distribution.sh \

			make_sharedlib_distribution.sh \

			make_win_src_distribution.sh \

			make_win_src_distribution_old.sh \

			msql2mysql.sh \

			mysql_config.sh \

			mysql_fix_privilege_tables.sh \
@@ -99,7 +99,7 @@ CLEANFILES = @server_scripts@ \ 
			mysql_tableinfo \

			mysql_upgrade_shell \

			mysqld_multi \

			make_win_src_distribution

			make_win_src_distribution_old



# mysqlbug should be distributed built so that people can report build

# failures with it.