Below is the list of changes that have just been committed into a local
4.1 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 12:53:01+01:00, df@stripped +22 -0
BUG#14420 follow the spirit of Vasil Dimov's patch on internals to make dbug compilation and linking dependent on debugging being configured in
configure.in@stripped, 2007-01-08 12:52:59+01:00, df@stripped +9 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
extra/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
heap/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
heap/hp_test2.c@stripped, 2007-01-08 12:52:59+01:00, df@stripped +0 -3
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
isam/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
isam/test2.c@stripped, 2007-01-08 12:52:59+01:00, df@stripped +0 -3
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
libmysql/Makefile.shared@stripped, 2007-01-08 12:52:59+01:00, df@stripped +6 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
libmysqld/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
myisam/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
myisam/mi_test2.c@stripped, 2007-01-08 12:52:59+01:00, df@stripped +0 -3
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
mysys/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/config/type_ndbapitest.mk.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/config/type_ndbapitools.mk.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/src/cw/cpcd/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/src/kernel/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/src/mgmclient/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/src/mgmsrv/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
ndb/test/run-test/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
netware/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
sql/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +1 -1
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
vio/Makefile.am@stripped, 2007-01-08 12:52:59+01:00, df@stripped +3 -3
BUG#14420 make dbug mentions in makefiles dependent on debugging switched on
# 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-4.1-build-work-14420
--- 1.420/configure.in 2006-11-27 18:29:37 +01:00
+++ 1.421/configure.in 2007-01-08 12:52:59 +01:00
@@ -1713,16 +1713,24 @@ then
# Medium debug.
CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"
+ dbug_lib="\$(top_builddir)/dbug/libdbug.a"
+ sql_server_dirs_dbug=dbug
elif test "$with_debug" = "full"
then
# Full debug. Very slow in some cases
CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS"
CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS"
+ dbug_lib="\$(top_builddir)/dbug/libdbug.a"
+ sql_server_dirs_dbug=dbug
else
# Optimized version. No debug
CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
+ dbug_lib=
+ sql_server_dirs_dbug=
fi
+AC_SUBST(dbug_lib)
+AM_CONDITIONAL(DBUG, test "$with_debug" = "yes" -o "$with_debug" = "full")
# Force static compilation to avoid linking problems/get more speed
AC_ARG_WITH(mysqld-ldflags,
@@ -3000,7 +3008,7 @@ then
THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o"
AC_SUBST(THREAD_LOBJECTS)
server_scripts="mysqld_safe mysql_install_db"
- sql_server_dirs="strings dbug mysys extra regex"
+ sql_server_dirs="strings $sql_server_dirs_dbug mysys extra regex"
#
--- 1.18/extra/Makefile.am 2005-07-03 03:28:42 +02:00
+++ 1.19/extra/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -18,7 +18,7 @@ INCLUDES = @MT_INCLUDES@ \
-I$(top_builddir)/include -I$(top_srcdir)/include \
@ndbcluster_includes@ -I$(top_srcdir)/sql
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
- ../dbug/libdbug.a ../strings/libmystrings.a
+ $(dbug_lib) ../strings/libmystrings.a
bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
resolve_stack_dump mysql_waitpid
--- 1.9/heap/Makefile.am 2005-07-03 03:28:44 +02:00
+++ 1.10/heap/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -16,7 +16,7 @@
INCLUDES = @MT_INCLUDES@ \
-I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
+LDADD = libheap.a ../mysys/libmysys.a $(dbug_lib) \
../strings/libmystrings.a
pkglib_LIBRARIES = libheap.a
noinst_PROGRAMS = hp_test1 hp_test2
--- 1.22/heap/hp_test2.c 2006-06-30 01:25:33 +02:00
+++ 1.23/heap/hp_test2.c 2007-01-08 12:52:59 +01:00
@@ -19,9 +19,6 @@
#ifndef USE_MY_FUNC /* We want to be able to dbug this !! */
#define USE_MY_FUNC
#endif
-#ifdef DBUG_OFF
-#undef DBUG_OFF
-#endif
#ifndef SAFEMALLOC
#define SAFEMALLOC
#endif
--- 1.9/isam/Makefile.am 2005-07-03 03:28:47 +02:00
+++ 1.10/isam/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -17,7 +17,7 @@
INCLUDES = @MT_INCLUDES@ \
-I$(top_builddir)/include -I$(top_srcdir)/include
LDADD = @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
- ../dbug/libdbug.a ../strings/libmystrings.a
+ $(dbug_lib) ../strings/libmystrings.a
pkglib_LIBRARIES = libnisam.a
bin_PROGRAMS = isamchk isamlog pack_isam
isamchk_DEPENDENCIES= $(LIBRARIES)
--- 1.16/isam/test2.c 2004-05-25 00:03:28 +02:00
+++ 1.17/isam/test2.c 2007-01-08 12:52:59 +01:00
@@ -19,9 +19,6 @@
#ifndef USE_MY_FUNC /* We want to be able to dbug this !! */
#define USE_MY_FUNC
#endif
-#ifdef DBUG_OFF
-#undef DBUG_OFF
-#endif
#ifndef SAFEMALLOC
#define SAFEMALLOC
#endif
--- 1.30/myisam/Makefile.am 2005-07-03 03:28:58 +02:00
+++ 1.31/myisam/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -21,7 +21,7 @@ INCLUDES = @MT_INCLUDES@ \
-I$(top_builddir)/include -I$(top_srcdir)/include
LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
$(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
pkglib_LIBRARIES = libmyisam.a
bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump
--- 1.29/myisam/mi_test2.c 2005-09-14 13:18:11 +02:00
+++ 1.30/myisam/mi_test2.c 2007-01-08 12:52:59 +01:00
@@ -19,9 +19,6 @@
#ifndef USE_MY_FUNC /* We want to be able to dbug this !! */
#define USE_MY_FUNC
#endif
-#ifdef DBUG_OFF
-#undef DBUG_OFF
-#endif
#ifndef SAFEMALLOC
#define SAFEMALLOC
#endif
--- 1.57/mysys/Makefile.am 2005-07-03 03:29:04 +02:00
+++ 1.58/mysys/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -21,7 +21,7 @@ INCLUDES = @MT_INCLUDES@ \
@ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(srcdir)
pkglib_LIBRARIES = libmysys.a
-LDADD = libmysys.a ../dbug/libdbug.a \
+LDADD = libmysys.a $(dbug_lib) \
../strings/libmystrings.a
noinst_HEADERS = mysys_priv.h my_static.h \
my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
--- 1.117/sql/Makefile.am 2006-09-25 20:01:37 +02:00
+++ 1.118/sql/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -35,7 +35,7 @@ LDADD = @isam_libs@ \
$(top_builddir)/heap/libheap.a \
$(top_builddir)/vio/libvio.a \
$(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/regex/libregex.a \
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
--- 1.14/vio/Makefile.am 2005-07-03 03:29:18 +02:00
+++ 1.15/vio/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -21,15 +21,15 @@ pkglib_LIBRARIES= libvio.a
noinst_PROGRAMS = test-ssl test-sslserver test-sslclient
noinst_HEADERS= vio_priv.h
test_ssl_SOURCES= test-ssl.c
-test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
+test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ $(dbug_lib) libvio.a \
../mysys/libmysys.a ../strings/libmystrings.a \
$(openssl_libs)
test_sslserver_SOURCES= test-sslserver.c
-test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
+test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ $(dbug_lib) libvio.a \
../mysys/libmysys.a ../strings/libmystrings.a \
$(openssl_libs)
test_sslclient_SOURCES= test-sslclient.c
-test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
+test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ $(dbug_lib) libvio.a \
../mysys/libmysys.a ../strings/libmystrings.a \
$(openssl_libs)
libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c
--- 1.15/netware/Makefile.am 2006-06-16 22:26:13 +02:00
+++ 1.16/netware/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -17,7 +17,7 @@
if HAVE_NETWARE
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
- ../dbug/libdbug.a ../strings/libmystrings.a
+ $(dbug_lib) ../strings/libmystrings.a
bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql
mysqld_safe_SOURCES= mysqld_safe.c my_manage.c
mysql_install_db_SOURCES= mysql_install_db.c my_manage.c
--- 1.63/libmysqld/Makefile.am 2006-11-27 18:29:37 +01:00
+++ 1.64/libmysqld/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -78,7 +78,7 @@ INC_LIB= $(top_builddir)/regex/libregex.
@innodb_libs@ @bdb_libs_with_path@ \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/vio/libvio.a
#
--- 1.58/libmysql/Makefile.shared 2006-01-17 15:51:05 +01:00
+++ 1.59/libmysql/Makefile.shared 2007-01-08 12:52:59 +01:00
@@ -49,7 +49,6 @@ mystringsobjects = strmov.lo strxmov.lo
ctype-uca.lo xml.lo my_strtoll10.lo
mystringsextra= strto.c
-dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
mysysheaders = mysys_priv.h my_static.h
vioheaders = vio_priv.h
mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
@@ -82,6 +81,12 @@ CLEANFILES = $(target_libadd) $(SHLIBOB
DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
+
+if DBUG
+dbugobjects = dbug.lo
+else
+dbugobjects =
+endif
# The automatic dependencies miss this
#bmove_upp.lo: $(LTCHARSET_OBJS)
--- 1.11/ndb/config/type_ndbapitest.mk.am 2006-11-27 18:29:37 +01:00
+++ 1.12/ndb/config/type_ndbapitest.mk.am 2007-01-08 12:52:59 +01:00
@@ -1,7 +1,7 @@
LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
$(top_builddir)/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
--- 1.12/ndb/src/cw/cpcd/Makefile.am 2004-11-11 21:25:32 +01:00
+++ 1.13/ndb/src/cw/cpcd/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -5,7 +5,7 @@ ndb_cpcd_SOURCES = main.cpp CPCD.cpp Pro
LDADD_LOC = \
$(top_builddir)/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
--- 1.13/ndb/src/kernel/Makefile.am 2006-11-27 18:29:37 +01:00
+++ 1.14/ndb/src/kernel/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -51,7 +51,7 @@ LDADD += \
$(top_builddir)/ndb/src/mgmapi/libmgmapi.la \
$(top_builddir)/ndb/src/common/portlib/libportlib.la \
$(top_builddir)/ndb/src/common/util/libgeneral.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
--- 1.4/ndb/src/kernel/blocks/dbdict/Makefile.am 2005-09-26 10:25:36 +02:00
+++ 1.5/ndb/src/kernel/blocks/dbdict/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -11,7 +11,7 @@ include $(top_srcdir)/ndb/config/type_ke
LDADD += \
$(top_builddir)/ndb/src/common/util/libgeneral.la \
$(top_builddir)/ndb/src/common/portlib/libportlib.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a
--- 1.17/ndb/src/mgmclient/Makefile.am 2004-11-16 07:20:51 +01:00
+++ 1.18/ndb/src/mgmclient/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -21,7 +21,7 @@ INCLUDES += -I$(top_srcdir)/ndb/include/
LDADD_LOC = $(noinst_LTLIBRARIES) \
../common/portlib/libportlib.la \
@readline_link@ \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
@TERMCAP_LIB@ @NDB_SCI_LIBS@
--- 1.21/ndb/src/mgmsrv/Makefile.am 2004-11-11 21:25:32 +01:00
+++ 1.22/ndb/src/mgmsrv/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -24,7 +24,7 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/n
-I$(top_srcdir)/ndb/src/common/mgmcommon
LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
@TERMCAP_LIB@
--- 1.19/ndb/test/run-test/Makefile.am 2006-03-22 13:38:01 +01:00
+++ 1.20/ndb/test/run-test/Makefile.am 2007-01-08 12:52:59 +01:00
@@ -18,7 +18,7 @@ atrt_SOURCES = main.cpp run-test.hpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include
LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
$(top_builddir)/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
--- 1.10/ndb/config/type_ndbapitools.mk.am 2006-11-27 18:29:37 +01:00
+++ 1.11/ndb/config/type_ndbapitools.mk.am 2007-01-08 12:52:59 +01:00
@@ -1,7 +1,7 @@
LDADD += \
$(top_builddir)/ndb/src/libndbclient.la \
- $(top_builddir)/dbug/libdbug.a \
+ $(dbug_lib) \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
| Thread |
|---|
| • bk commit into 4.1 tree (df:1.2586) BUG#14420 | Daniel Fischer | 8 Jan |
