Commit 113f983e authored by unknown's avatar unknown
Browse files

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

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
parents 665ebc05 dbe0b91e

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

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,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 \