bk commit into 5.1 tree (mtaylor:1.2581)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor.  When mtaylor 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, 2008-04-09 15:52:21+02:00, mtaylor@solace.(none) +1 -0
  ha_ndbcluster.cc uses ndb_init_internal, so it needs to be extern "C" too. 

  storage/ndb/src/common/util/ndb_init.cpp@stripped, 2008-04-09 15:52:20+02:00,
mtaylor@solace.(none) +3 -8
    ha_ndbcluster.cc uses ndb_init_internal, so it needs to be extern "C" too. 

diff -Nrup a/storage/ndb/src/common/util/ndb_init.cpp
b/storage/ndb/src/common/util/ndb_init.cpp
--- a/storage/ndb/src/common/util/ndb_init.cpp	2008-04-09 15:33:59 +02:00
+++ b/storage/ndb/src/common/util/ndb_init.cpp	2008-04-09 15:52:20 +02:00
@@ -26,6 +26,9 @@ extern void destroy_event_logger(class E
 
 static int ndb_init_called = 0;
 
+extern "C"
+{
+
 void
 ndb_init_internal()
 {
@@ -43,9 +46,6 @@ ndb_init_internal()
   }
 }
 
-extern "C"
-{
-
 int
 ndb_init()
 {
@@ -63,8 +63,6 @@ ndb_init()
   return 0;
 }
 
-} /* extern "C" */
-
 void
 ndb_end_internal()
 {
@@ -73,9 +71,6 @@ ndb_end_internal()
   if (g_eventLogger)
     destroy_event_logger(&g_eventLogger);
 }
-
-extern "C"
-{
 
 void
 ndb_end(int flags)