bk commit into 5.1 tree (mikron:1.2540)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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-05-17 12:58:13+02:00, mikron@stripped +2 -0
  First attempt wasn't entirely successful
  Remove definition in tsman.cpp instead

  storage/ndb/src/kernel/blocks/tsman.cpp@stripped, 2007-05-17 12:58:10+02:00,
mikron@stripped +0 -1
    First attempt wasn't entirely successful
    Remove definition in tsman.cpp instead

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@stripped, 2007-05-17 12:58:10+02:00,
mikron@stripped +1 -1
    First attempt wasn't entirely successful
    Remove definition in tsman.cpp instead

# 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:	mikron
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/mysql_clones/build_telco

--- 1.18/storage/ndb/src/kernel/blocks/tsman.cpp	2007-05-15 09:13:17 +02:00
+++ 1.19/storage/ndb/src/kernel/blocks/tsman.cpp	2007-05-17 12:58:10 +02:00
@@ -181,7 +181,6 @@
   Vector<Uint32> bitmask;
 };
 template class Vector<TsmanChunk>;
-template class Vector<Uint32>;
 #endif
 
 void

--- 1.16/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2007-05-17 11:07:17 +02:00
+++ 1.17/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2007-05-17 12:58:10 +02:00
@@ -957,4 +957,4 @@
 template class Vector<Chunk>;
 
 #endif
-
+template class Vector<Uint32>;