bk commit into 5.1 tree (jonas:1.2000)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.2000 06/01/10 15:29:33 jonas@stripped +3 -0
  ndb dd -
    add buddy to unit test programs

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
    1.2 06/01/10 15:29:30 jonas@stripped +1 -1
    Fix compile error

  storage/ndb/src/kernel/vm/mem.txt
    1.2 06/01/10 15:29:30 jonas@stripped +1 -0
    Update doc

  storage/ndb/src/kernel/vm/Makefile.am
    1.13 06/01/10 15:29:30 jonas@stripped +9 -0
    Add unit test to make file

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-dd

--- 1.1/storage/ndb/src/kernel/vm/mem.txt	2005-11-26 17:28:51 +01:00
+++ 1.2/storage/ndb/src/kernel/vm/mem.txt	2006-01-10 15:29:30 +01:00
@@ -31,3 +31,4 @@
   TUP PageMan
   Restore
   Backup
+  Lgman::Logbuffer

--- 1.1/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2005-11-11 14:20:46 +01:00
+++ 1.2/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2006-01-10 15:29:30 +01:00
@@ -405,6 +405,6 @@
     }
 }
 
-template Vector<Chunk>;
+template class Vector<Chunk>;
 
 #endif

--- 1.12/storage/ndb/src/kernel/vm/Makefile.am	2005-11-11 14:20:46 +01:00
+++ 1.13/storage/ndb/src/kernel/vm/Makefile.am	2006-01-10 15:29:30 +01:00
@@ -43,3 +43,12 @@
 	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
 	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
 	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
+
+EXTRA_PROGRAMS = ndbd_malloc_impl_test
+ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_TEST
+ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
+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 \
+  $(top_builddir)/strings/libmystrings.a