bk commit into 5.1 tree (df:1.2385) BUG#14420

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.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 14:48:51+01:00, df@stripped +10 -0
  BUG#14420 after-merge fixes for 5.1

  configure.in@stripped, 2007-01-08 14:48:48+01:00, df@stripped +1 -0
    BUG#14420 after-merge fix

  storage/archive/Makefile.am@stripped, 2007-01-08 14:48:48+01:00, df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/blocks/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/blocks/backup/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/blocks/dbdih/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/blocks/dbtup/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +1 -1
    BUG#14420 don't depend on libdbug if debugging is configured out

  storage/ndb/src/kernel/vm/Makefile.am@stripped, 2007-01-08 14:48:48+01:00,
df@stripped +3 -3
    BUG#14420 don't depend on libdbug if debugging is configured out

  unittest/mysys/Makefile.am@stripped, 2007-01-08 14:48:48+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.1-build-work-14420

--- 1.412/configure.in	2007-01-08 14:09:46 +01:00
+++ 1.413/configure.in	2007-01-08 14:48:48 +01:00
@@ -1588,6 +1588,7 @@ then
     AC_DEFINE([ERROR_INJECT_SUPPORT], [1],
               [Enable error injection in MySQL Server])
   fi
+fi
 
 AC_ARG_WITH([fast-mutexes],
 	    AC_HELP_STRING([--with-fast-mutexes], 

--- 1.10/storage/archive/Makefile.am	2006-12-31 02:24:03 +01:00
+++ 1.11/storage/archive/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -50,7 +50,7 @@ libarchive_a_SOURCES =	ha_archive.cc azi
 archive_test_SOURCES =	archive_test.c azio.c
 archive_test_CFLAGS =	$(AM_CFLAGS)
 archive_test_LDADD =	$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
+			$(dbug_lib) \
 			$(top_builddir)/strings/libmystrings.a \
 			@ZLIB_LIBS@
 archive_test_LDFLAGS = @NOINST_LDFLAGS@

--- 1.7/unittest/mysys/Makefile.am	2006-12-31 02:28:54 +01:00
+++ 1.8/unittest/mysys/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -18,7 +18,7 @@ AM_CPPFLAGS     += -I$(top_srcdir)/inclu
 
 LDADD 		= $(top_builddir)/unittest/mytap/libmytap.a \
 		  $(top_builddir)/mysys/libmysys.a \
-		  $(top_builddir)/dbug/libdbug.a \
+		  $(dbug_lib) \
 		  $(top_builddir)/strings/libmystrings.a
 
 noinst_PROGRAMS  = bitmap-t base64-t my_atomic-t

--- 1.8/storage/ndb/src/kernel/blocks/Makefile.am	2006-12-31 01:06:42 +01:00
+++ 1.9/storage/ndb/src/kernel/blocks/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -57,7 +57,7 @@ EXTRA_PROGRAMS = ndb_print_file
 ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
 ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.a \
+         $(dbug_lib) \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
 

--- 1.9/storage/ndb/src/kernel/blocks/backup/Makefile.am	2006-12-31 01:06:42 +01:00
+++ 1.10/storage/ndb/src/kernel/blocks/backup/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -18,7 +18,7 @@ ndb_print_backup_file_SOURCES = read.cpp
 ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
          $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/dbug/libdbug.a \
+         $(dbug_lib) \
          $(top_builddir)/strings/libmystrings.a
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am

--- 1.10/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2007-01-08 14:00:46 +01:00
+++ 1.11/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -19,7 +19,7 @@ include $(top_srcdir)/storage/ndb/config
 LDADD +=  \
          $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
          $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
-         $(top_builddir)/dbug/libdbug.a \
+         $(dbug_lib) \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
 

--- 1.9/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2006-12-31 01:29:35 +01:00
+++ 1.10/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -17,7 +17,7 @@ ndbtools_PROGRAMS = ndb_print_sys_file
 ndb_print_sys_file_SOURCES = printSysfile.cpp
 ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.a \
+         $(dbug_lib) \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
 

--- 1.9/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2006-12-31 01:30:44 +01:00
+++ 1.10/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -23,7 +23,7 @@ include $(top_srcdir)/storage/ndb/config
 
 ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.a \
+         $(dbug_lib) \
          $(top_builddir)/mysys/libmysys.a \
          $(top_builddir)/strings/libmystrings.a
 

--- 1.10/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2006-12-31 01:32:00 +01:00
+++ 1.11/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -21,7 +21,7 @@ test_varpage_SOURCES = test_varpage.cpp 
 test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
   $(top_builddir)/mysys/libmysys.a \
-  $(top_builddir)/dbug/libdbug.a \
+  $(dbug_lib) \
   $(top_builddir)/strings/libmystrings.a
 
 # Don't update the files from bitkeeper

--- 1.20/storage/ndb/src/kernel/vm/Makefile.am	2006-12-31 01:06:42 +01:00
+++ 1.21/storage/ndb/src/kernel/vm/Makefile.am	2007-01-08 14:48:48 +01:00
@@ -66,7 +66,7 @@ ndbd_malloc_impl_test_SOURCES = ndbd_mal
 ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
   $(top_builddir)/mysys/libmysys.a \
-  $(top_builddir)/dbug/libdbug.a \
+  $(dbug_lib) \
   $(top_builddir)/strings/libmystrings.a
 
 bench_pool_SOURCES = bench_pool.cpp
@@ -74,7 +74,7 @@ bench_pool_LDFLAGS = @ndb_bin_am_ldflags
   libkernel.a ../error/liberror.a \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
   $(top_builddir)/mysys/libmysys.a \
-  $(top_builddir)/dbug/libdbug.a \
+  $(dbug_lib) \
   $(top_builddir)/strings/libmystrings.a
 
 testDynArr256_CXXFLAGS = -DUNIT_TEST
@@ -83,6 +83,6 @@ testDynArr256_LDFLAGS = @ndb_bin_am_ldfl
   libkernel.a ../error/liberror.a \
   $(top_builddir)/storage/ndb/src/libndbclient.la \
   $(top_builddir)/mysys/libmysys.a \
-  $(top_builddir)/dbug/libdbug.a \
+  $(dbug_lib) \
   $(top_builddir)/strings/libmystrings.a