Commit 987b1b59 authored Sep 23, 2006 by cmiller@zippy.cornsilk.net

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

parents a22f71ff 7a761a25

.bzrignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@
		*.vcproj
		/.dir/*
		/_pure_*warnings
		*/.deps
		/.libs/
		*/.pure
		/debug/
		/release/

BitKeeper/etc/collapsed

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,4 @@
		44ec850ac2k4y2Omgr92GiWPBAVKGQ
		44edb86b1iE5knJ97MbliK_3lCiAXA
		44f33f3aj5KW5qweQeekY1LU0E9ZCg
		4513d8e4Af4dQWuk13sArwofRgFDQw

Docs/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		noinst_SCRIPTS = Support/generate-text-files.pl

		EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY
		EXTRA_DIST = $(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY

		TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
		INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

Docs/manual.chm

0 → 100644

+14 −0

Original line number	Diff line number	Diff line

		*********************************************************

		This is a dummy placeholder file for "manual.chm" in the
		MySQL source trees.

		Note, that the documentation has been moved into a separate
		BitKeeper source tree named "mysqldoc" - do not attempt to edit this
		file! All changes to it should be done in the mysqldoc tree.

		This dummy file is being replaced with the actual file from the
		mysqldoc tree when building the official source distribution.

		*********************************************************

client/CMakeLists.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,9 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock
		ADD_EXECUTABLE(mysqlimport mysqlimport.c)
		TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)

		ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
		TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)

		ADD_EXECUTABLE(mysqlshow mysqlshow.c)
		TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)