bk commit into 5.2 tree (stewart:1.2111)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.2 repository of stewart. When stewart 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.2111 06/03/10 11:27:49 stewart@stripped +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.0/printFragList
  into  mysql.com:/home/stewart/Documents/MySQL/5.2/wl1504-add-node

  storage/ndb/src/kernel/blocks/dbdih/Makefile.am
    1.9 06/03/10 11:27:45 stewart@stripped +0 -0
    SCCS merged

  storage/ndb/src/kernel/blocks/dbdih/Makefile.am
    1.3.2.2 06/03/10 11:26:52 stewart@stripped +0 -0
    Merge rename: ndb/src/kernel/blocks/dbdih/Makefile.am -> storage/ndb/src/kernel/blocks/dbdih/Makefile.am

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.2/wl1504-add-node/RESYNC

--- 1.3.2.1/ndb/src/kernel/blocks/dbdih/Makefile.am	2005-12-08 11:29:04 +01:00
+++ 1.9/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2006-03-10 11:27:45 +01:00
@@ -1,30 +1,13 @@
-noinst_LIBRARIES = libdbdih.a
-EXTRA_PROGRAMS = ndbd_sysfile_reader ndbd_fraglist_reader
 
-libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
-ndbd_sysfile_reader_SOURCES = printSysfile/printSysfile.cpp
-ndbd_fraglist_reader_SOURCES = printFragList.cpp
+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 \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
 
-LDADD +=  \
-              $(top_builddir)/ndb/src/common/util/libgeneral.la \
-              $(top_builddir)/ndb/src/common/portlib/libportlib.la
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbdih.dsp
-
-libdbdih.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)