bk commit into 5.1 tree (rafal:1.2539)

[rsomla]

Below is the list of changes that have just been committed into a local
5.1 repository of rafal. When rafal 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-06-29 00:29:19+02:00, rafal@quant.(none) +4 -0
  WL#3327: Fix template instantations which were wrongly done inside 
  headers leading to linker failures on some platforms.

  sql/backup/stream.cc@stripped, 2007-06-29 00:28:54+02:00, rafal@quant.(none) +3 -0
    Move explicit template instantations from headers to compilation units.

  sql/backup/stream.h@stripped, 2007-06-29 00:28:54+02:00, rafal@quant.(none) +0 -4
    Move explicit template instantations from headers to compilation units.

  sql/backup/string_pool.cc@stripped, 2007-06-29 00:28:54+02:00, rafal@quant.(none) +2 -0
    Move explicit template instantations from headers to compilation units.

  sql/backup/string_pool.h@stripped, 2007-06-29 00:28:54+02:00, rafal@quant.(none) +0 -1
    Move explicit template instantations from headers to compilation units.

# 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:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/backup/prototype-push

--- 1.7/sql/backup/stream.cc	2007-06-29 00:29:25 +02:00
+++ 1.8/sql/backup/stream.cc	2007-06-29 00:29:25 +02:00
@@ -2,6 +2,9 @@
 
 #include "stream.h"
 
+template class util::IStream< backup::Window >;
+template class util::OStream< backup::Window >;
+
 
 namespace backup {
 

--- 1.10/sql/backup/stream.h	2007-06-29 00:29:25 +02:00
+++ 1.11/sql/backup/stream.h	2007-06-29 00:29:25 +02:00
@@ -429,10 +429,6 @@
 
 } // backup namespace
 
-
-template class util::IStream< backup::Window >;
-template class util::OStream< backup::Window >;
-
 namespace backup {
 
 /****************************************************

--- 1.3/sql/backup/string_pool.cc	2007-06-29 00:29:25 +02:00
+++ 1.4/sql/backup/string_pool.cc	2007-06-29 00:29:25 +02:00
@@ -15,6 +15,8 @@
 
 String &StringDom::null= const_cast< String& >(::my_null_string);
 
+template class Map<StringDom>;
+
 } // util namespace
 
 

--- 1.2/sql/backup/string_pool.h	2007-06-29 00:29:26 +02:00
+++ 1.3/sql/backup/string_pool.h	2007-06-29 00:29:26 +02:00
@@ -27,7 +27,6 @@
   { return 0; }
 };
 
-template class Map<StringDom>;
 typedef Map<StringDom>  StringPool;
 
 } // util namespace