Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2156 06/02/22 20:34:25 kent@stripped +6 -0
Makefile.am:
Change for 'make distcheck'
libmysqld.vcproj:
Typo
storage/heap/Makefile.am
1.13 06/02/22 20:24:04 kent@stripped +4 -3
Change for 'make distcheck'
storage/csv/Makefile.am
1.6 06/02/22 20:22:50 kent@stripped +2 -1
Change for 'make distcheck'
plugin/fulltext/Makefile.am
1.3 06/02/22 20:21:27 kent@stripped +1 -1
Change for 'make distcheck'
storage/archive/Makefile.am
1.2 06/02/22 20:21:00 kent@stripped +4 -3
Change for 'make distcheck'
mysql-test/ndb/Makefile.am
1.7 06/02/22 20:16:56 kent@stripped +2 -0
Change for 'make distcheck'
VC++Files/libmysqld/libmysqld.vcproj
1.7 06/02/22 20:05:45 kent@stripped +1 -1
Typo
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: c-5e4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.1-release
--- 1.12/storage/heap/Makefile.am 2005-07-12 19:23:29 +02:00
+++ 1.13/storage/heap/Makefile.am 2006-02-22 20:24:04 +01:00
@@ -15,9 +15,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD = libheap.a $(top_srcdir)/mysys/libmysys.a \
- $(top_srcdir)/dbug/libdbug.a \
- $(top_srcdir)/strings/libmystrings.a
+LDADD = libheap.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/strings/libmystrings.a
pkglib_LIBRARIES = libheap.a
noinst_PROGRAMS = hp_test1 hp_test2
hp_test1_LDFLAGS = @NOINST_LDFLAGS@
--- 1.5/storage/csv/Makefile.am 2006-01-19 22:40:51 +01:00
+++ 1.6/storage/csv/Makefile.am 2006-02-22 20:22:50 +01:00
@@ -20,7 +20,8 @@
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)
--- 1.1/storage/archive/Makefile.am 2005-12-23 04:49:59 +01:00
+++ 1.2/storage/archive/Makefile.am 2006-02-22 20:21:00 +01:00
@@ -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
--- 1.6/VC++Files/libmysqld/libmysqld.vcproj 2006-02-17 19:24:07 +01:00
+++ 1.7/VC++Files/libmysqld/libmysqld.vcproj 2006-02-22 20:05:45 +01:00
@@ -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"
--- 1.2/plugin/fulltext/Makefile.am 2006-01-04 10:36:34 +01:00
+++ 1.3/plugin/fulltext/Makefile.am 2006-02-22 20:21:27 +01:00
@@ -1,4 +1,4 @@
-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)
--- 1.6/mysql-test/ndb/Makefile.am 2006-01-12 19:50:29 +01:00
+++ 1.7/mysql-test/ndb/Makefile.am 2006-02-22 20:16:56 +01:00
@@ -1,4 +1,6 @@
+BUILT_SOURCES = ndbcluster
+
benchdir_root= $(prefix)
testdir = $(benchdir_root)/mysql-test/ndb
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2156) | kent | 22 Feb |
