bk commit into 5.1 tree (joerg:1.2139)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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.2139 06/02/08 19:01:54 joerg@stripped +2 -0
  Link errors in 5.1.6 on Solaris in debug builds, overcome by not building two NDB test programs.

  storage/ndb/src/kernel/blocks/dbtup/Makefile.am
    1.8 06/02/08 19:01:48 joerg@stripped +1 -1
    Fix proposed by Jonas Oreland: Stop building "test_varpage", it is just for testing.

  storage/ndb/src/kernel/blocks/Makefile.am
    1.6 06/02/08 19:01:48 joerg@stripped +1 -1
    Fix proposed by Jonas Oreland: Stop building "ndb_print_file", it is just for testing.

# 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:	joerg
# Host:	trift2.
# Root:	/M51/clone-5.1

--- 1.5/storage/ndb/src/kernel/blocks/Makefile.am	2005-11-07 12:19:06 +01:00
+++ 1.6/storage/ndb/src/kernel/blocks/Makefile.am	2006-02-08 19:01:48 +01:00
@@ -20,7 +20,7 @@
 INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh
 libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp
 
-ndbtools_PROGRAMS = ndb_print_file
+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 \

--- 1.7/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2005-11-07 12:19:07 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2006-02-08 19:01:48 +01:00
@@ -42,7 +42,7 @@
 	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
 	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
 
-ndbtest_PROGRAMS = test_varpage
+EXTRA_PROGRAMS = test_varpage
 test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
 test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
   $(top_builddir)/storage/ndb/src/libndbclient.la \