Commit f7489c32 authored Dec 14, 2005 by unknown

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

parents 3f39dd45 12046696

netware/BUILD/compile-linux-tools

+3 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,8 @@ rm -f /.linux
		./configure --without-innodb --without-docs

		# build tools only
		make clean all-local
		make clean
		make
		(cd dbug; make libdbug.a)
		(cd strings; make libmystrings.a)
		(cd mysys; make libmysys.a)
		@@ -53,7 +54,7 @@ make clean all-local
		# copying required linux tools
		cp extra/comp_err extra/comp_err.linux
		cp libmysql/conf_to_src libmysql/conf_to_src.linux
		cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
		#cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
		cp sql/gen_lex_hash sql/gen_lex_hash.linux
		cp strings/conf_to_src strings/conf_to_src.linux

netware/libmysql.def

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,5 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
		DESCRIPTION "MySQL Client Library"
		VERSION 4, 0
		AUTOUNLOAD
		STACKSIZE 32768
		XDCDATA ../netware/mysql.xdc
		#DEBUG

netware/my_print_defaults.def

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ MODULE libc.nlm
		COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
		DESCRIPTION "MySQL Print Defaults Tool"
		VERSION 4, 0
		STACKSIZE 32768
		XDCDATA ../netware/mysql.xdc
		#DEBUG

netware/myisamlog.def

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
		COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
		DESCRIPTION "MySQL MyISAM Table Log Tool"
		VERSION 4, 0
		STACKSIZE 32768
		XDCDATA ../netware/mysql.xdc
		#DEBUG

netware/myisampack.def

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
		COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
		DESCRIPTION "MySQL MyISAM Table Pack Tool"
		VERSION 4, 0
		STACKSIZE 32768
		XDCDATA ../netware/mysql.xdc
		#DEBUG