MySQL Lists: commits: bk commit into 5.0 tree (df:1.2365) BUG#14420

List:	Commits	« Previous Message Next Message »
From:	Daniel Fischer	Date:	January 8 2007 1:05pm
Subject:	bk commit into 5.0 tree (df:1.2365) BUG#14420
View as plain text
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:04:57+01:00, df@stripped +22 -0
  BUG#14420 merge to 5.0
  MERGE: 1.1616.2890.1

  BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09@stripped, 2007-01-08 12:55:57+01:00,
df@stripped +0 -0
    Auto merged
    MERGE: 1.8.2.2

  BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09@stripped, 2007-01-08 12:55:57+01:00,
df@stripped +0 -0
    Merge rename: isam/Makefile.am ->
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09

  BitKeeper/deleted/.del-test2.c~2f9a632cab572958@stripped, 2007-01-08 12:55:57+01:00,
df@stripped +0 -0
    Auto merged
    MERGE: 1.16.1.2

  BitKeeper/deleted/.del-test2.c~2f9a632cab572958@stripped, 2007-01-08 12:55:57+01:00,
df@stripped +0 -0
    Merge rename: isam/test2.c -> BitKeeper/deleted/.del-test2.c~2f9a632cab572958

  configure.in@stripped, 2007-01-08 13:04:56+01:00, df@stripped +3 -4
    BUG#14420 merge to 5.0
    MERGE: 1.201.71.1

  extra/Makefile.am@stripped, 2007-01-08 13:04:56+01:00, df@stripped +0 -0
    BUG#14420 merge to 5.0
    MERGE: 1.17.1.2

  heap/Makefile.am@stripped, 2007-01-08 12:55:57+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.2

  heap/hp_test2.c@stripped, 2007-01-08 12:55:57+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.1

  libmysql/Makefile.shared@stripped, 2007-01-08 13:04:56+01:00, df@stripped +0 -0
    BUG#14420 merge to 5.0
    MERGE: 1.55.1.4

  libmysqld/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.35

  myisam/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.28.1.3

  myisam/mi_test2.c@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.1

  mysys/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.4

  ndb/config/type_ndbapitest.mk.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped
+0 -0
    Auto merged
    MERGE: 1.11.1.1

  ndb/config/type_ndbapitools.mk.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped
+0 -0
    Auto merged
    MERGE: 1.9.1.2

  ndb/src/cw/cpcd/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.1

  ndb/src/kernel/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.11.1.3

  ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2007-01-08 12:55:58+01:00,
df@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.1

  ndb/src/mgmclient/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0
-0
    Auto merged
    MERGE: 1.17.1.1

  ndb/src/mgmsrv/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.1

  ndb/test/run-test/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0
-0
    Auto merged
    MERGE: 1.15.1.5

  netware/Makefile.am@stripped, 2007-01-08 13:04:56+01:00, df@stripped +2 -2
    BUG#14420 merge to 5.0
    MERGE: 1.7.1.9

  sql/Makefile.am@stripped, 2007-01-08 12:55:58+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.77.1.41

  vio/Makefile.am@stripped, 2007-01-08 13:04:56+01:00, df@stripped +0 -3
    BUG#14420 merge to 5.0
    MERGE: 1.13.1.2

# 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/RESYNC

--- 1.416/configure.in	2007-01-01 09:54:27 +01:00
+++ 1.417/configure.in	2007-01-08 13:04:56 +01:00
@@ -1668,16 +1668,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 $CFLAGS"
   CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $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,
@@ -2544,7 +2552,7 @@ fi
 if test "$with_server" != "no"
 then
   server_scripts="mysqld_safe mysql_install_db"
-  sql_server_dirs="strings mysys dbug extra regex"
+  sql_server_dirs="strings mysys $sql_server_dirs_dbug extra regex"
 
 
   #

--- 1.37/extra/Makefile.am	2006-12-30 21:02:04 +01:00
+++ 1.38/extra/Makefile.am	2007-01-08 13:04:56 +01:00
@@ -16,7 +16,7 @@
 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
 BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/sql_state.h \
                         $(top_builddir)/include/mysqld_ername.h

--- 1.13/heap/Makefile.am	2006-12-30 21:02:04 +01:00
+++ 1.14/heap/Makefile.am	2007-01-08 12:55:57 +01:00
@@ -14,7 +14,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 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.24/heap/hp_test2.c	2006-12-30 21:02:04 +01:00
+++ 1.25/heap/hp_test2.c	2007-01-08 12:55:57 +01:00
@@ -18,9 +18,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.34/myisam/Makefile.am	2006-12-30 21:02:04 +01:00
+++ 1.35/myisam/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -19,7 +19,7 @@ pkgdata_DATA =		mi_test_all mi_test_all.
 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.32/myisam/mi_test2.c	2006-12-30 21:02:05 +01:00
+++ 1.33/myisam/mi_test2.c	2007-01-08 12:55:58 +01:00
@@ -18,9 +18,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.74/mysys/Makefile.am	2006-12-30 21:02:05 +01:00
+++ 1.75/mysys/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -19,7 +19,7 @@ MYSQLBASEdir=		$(prefix)
 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.130/sql/Makefile.am	2006-12-30 21:02:06 +01:00
+++ 1.131/sql/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -34,7 +34,7 @@ LDADD =			$(top_builddir)/myisam/libmyis
 			$(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.20/netware/Makefile.am	2006-12-02 06:06:19 +01:00
+++ 1.21/netware/Makefile.am	2007-01-08 13:04:56 +01:00
@@ -17,7 +17,8 @@
 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.72/libmysqld/Makefile.am	2006-12-30 21:02:04 +01:00
+++ 1.73/libmysqld/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -80,7 +80,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.69/libmysql/Makefile.shared	2006-11-27 21:12:37 +01:00
+++ 1.70/libmysql/Makefile.shared	2007-01-08 13:04:56 +01:00
@@ -49,7 +49,6 @@ mystringsobjects =	strmov.lo strxmov.lo 
 			ctype-uca.lo xml.lo my_strtoll10.lo str_alloc.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 \
@@ -87,6 +86,12 @@ DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYS
 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
 			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
+
+if DBUG
+dbugobjects = dbug.lo
+else
+dbugobjects =
+endif
 
 if HAVE_YASSL
 yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \

--- 1.12/ndb/config/type_ndbapitest.mk.am	2006-12-31 00:26:24 +01:00
+++ 1.13/ndb/config/type_ndbapitest.mk.am	2007-01-08 12:55:58 +01:00
@@ -15,7 +15,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.13/ndb/src/cw/cpcd/Makefile.am	2006-12-30 22:07:31 +01:00
+++ 1.14/ndb/src/cw/cpcd/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -19,7 +19,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.15/ndb/src/kernel/Makefile.am	2006-12-30 22:07:31 +01:00
+++ 1.16/ndb/src/kernel/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -66,7 +66,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@
 

--- 1.5/ndb/src/kernel/blocks/dbdict/Makefile.am	2006-12-30 22:07:31 +01:00
+++ 1.6/ndb/src/kernel/blocks/dbdict/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -26,7 +26,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.18/ndb/src/mgmclient/Makefile.am	2006-12-30 22:07:31 +01:00
+++ 1.19/ndb/src/mgmclient/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -35,7 +35,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.24/ndb/src/mgmsrv/Makefile.am	2006-12-30 22:07:31 +01:00
+++ 1.25/ndb/src/mgmsrv/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -40,7 +40,7 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/n
 
 LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.o \
             $(top_builddir)/ndb/src/libndbclient.la \
-            $(top_builddir)/dbug/libdbug.a \
+            $(dbug_lib) \
             $(top_builddir)/mysys/libmysys.a \
             $(top_builddir)/strings/libmystrings.a \
             @readline_link@ \

--- 1.24/ndb/test/run-test/Makefile.am	2006-12-30 22:07:31 +01:00
+++ 1.25/ndb/test/run-test/Makefile.am	2007-01-08 12:55:58 +01:00
@@ -32,7 +32,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.12/ndb/config/type_ndbapitools.mk.am	2006-12-31 00:26:24 +01:00
+++ 1.13/ndb/config/type_ndbapitools.mk.am	2007-01-08 12:55:58 +01:00
@@ -15,7 +15,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@
Thread
• bk commit into 5.0 tree (df:1.2365) BUG#14420	Daniel Fischer	8 Jan