Commit 00959e4d authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

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


configure.in:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
Docs/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
parents b0d956fe fcd21bd4

Docs/Makefile.am

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


noinst_SCRIPTS =	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.



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

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -1086,6 +1086,7 @@ EOF 
    #

    echo -n "making sure specific build files are writable... "

    for file in \

        Docs/manual.chm \

        Docs/mysql.info \

        Docs/INSTALL-BINARY \

        INSTALL-SOURCE \