bk commit into 5.1 tree (mtaylor:1.2580) BUG#35927

[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:34:01+02:00, mtaylor@solace.(none) +1 -0
  BUG#35927 global g_eventLogger breaks dlopened libndbclient
  
  Made ndb_init_called static to not pollute the global namespace.

  storage/ndb/src/common/util/ndb_init.cpp@stripped, 2008-04-09 15:33:59+02:00,
mtaylor@solace.(none) +11 -5
    BUG#35927 global g_eventLogger breaks dlopened libndbclient
    
    Made ndb_init_called static to not pollute the global namespace.

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:10:24 +02:00
+++ b/storage/ndb/src/common/util/ndb_init.cpp	2008-04-09 15:33:59 +02:00
@@ -24,10 +24,7 @@ NdbMutex *g_ndb_connection_mutex = NULL;
 extern class EventLogger * create_event_logger();
 extern void destroy_event_logger(class EventLogger ** g_eventLogger);
 
-int ndb_init_called = 0;
-
-extern "C"
-{
+static int ndb_init_called = 0;
 
 void
 ndb_init_internal()
@@ -46,6 +43,9 @@ ndb_init_internal()
   }
 }
 
+extern "C"
+{
+
 int
 ndb_init()
 {
@@ -63,6 +63,8 @@ ndb_init()
   return 0;
 }
 
+} /* extern "C" */
+
 void
 ndb_end_internal()
 {
@@ -72,6 +74,9 @@ ndb_end_internal()
     destroy_event_logger(&g_eventLogger);
 }
 
+extern "C"
+{
+
 void
 ndb_end(int flags)
 {
@@ -79,7 +84,8 @@ ndb_end(int flags)
   {
     my_end(flags);
     ndb_end_internal();
+    ndb_init_called = 0;
   }
 }
 
-}
+} /* extern "C" */