Commit 9233f62f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
parents 5e02bec9 3150f7cc

VC++Files/libmysqld/libmysqld.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../storage/bdb/build_win32,../zlib"

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"/>

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

mysql-test/ndb/Makefile.am

+2 −0
Original line number Diff line number Diff line 


BUILT_SOURCES =		ndbcluster



benchdir_root=		$(prefix)

testdir =	        $(benchdir_root)/mysql-test/ndb

plugin/fulltext/Makefile.am

+1 −1
Original line number Diff line number Diff line 
INCLUDES= -I$(top_builddir)/include

INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include

noinst_LTLIBRARIES= mypluglib.la

mypluglib_la_SOURCES= plugin_example.c

mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir)

storage/archive/Makefile.am

+4 −3
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \

			@ZLIB_INCLUDES@



LDADD =			libarchive.a $(top_srcdir)/mysys/libmysys.a \

			$(top_srcdir)/dbug/libdbug.a \

			$(top_srcdir)/strings/libmystrings.a \

LDADD =			libarchive.a \

			$(top_builddir)/mysys/libmysys.a \

			$(top_builddir)/dbug/libdbug.a \

			$(top_builddir)/strings/libmystrings.a \

			@ZLIB_LIBS@

pkglib_LIBRARIES =	libarchive.a

noinst_PROGRAMS	=	archive_test

storage/csv/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ MYSQLDATAdir = $(localstatedir) 
MYSQLSHAREdir =         $(pkgdatadir)

MYSQLBASEdir=           $(prefix)

MYSQLLIBdir=            $(pkglibdir)

INCLUDES =              -I$(top_srcdir)/include \

INCLUDES =              -I$(top_builddir)/include \

			-I$(top_srcdir)/include \

			-I$(top_srcdir)/regex \

			-I$(top_srcdir)/sql \

                        -I$(srcdir)