Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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@stripped, 2007-01-08 13:59:39+01:00, df@stripped +2 -0
BUG#14420 after-merge fixes for 5.0
ndb/src/common/util/Makefile.am@stripped, 2007-01-08 13:59:37+01:00, df@stripped +1 -1
BUG#14420 don't depend on libdbug if debugging is configured out
server-tools/instance-manager/Makefile.am@stripped, 2007-01-08 13:59:37+01:00, df@stripped +1 -1
BUG#14420 don't depend on libdbug if debugging is configured out
# 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: df
# Host: kahlann.erinye.com
# Root: /home/df/mysql/build/mysql-5.0-build-work-14420
--- 1.34/server-tools/instance-manager/Makefile.am 2006-12-23 20:04:23 +01:00
+++ 1.35/server-tools/instance-manager/Makefile.am 2007-01-08 13:59:37 +01:00
@@ -83,7 +83,7 @@ mysqlmanager_LDADD= liboptions.la \
$(top_builddir)/vio/libvio.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
--- 1.12/ndb/src/common/util/Makefile.am 2006-12-30 22:07:31 +01:00
+++ 1.13/ndb/src/common/util/Makefile.am 2007-01-08 13:59:37 +01:00
@@ -30,7 +30,7 @@ EXTRA_PROGRAMS = testBitmask
testBitmask_SOURCES = testBitmask.cpp
testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a
| Thread |
|---|
| • bk commit into 5.0 tree (df:1.2366) BUG#14420 | Daniel Fischer | 8 Jan |
