bk commit into 5.1 tree (jonas:1.2371)

[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@stripped, 2006-12-19 14:23:31+01:00, jonas@stripped +5 -0
  ndb - fix a couple of bugs related to adding length of signal to EventLogger (and children)

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2006-12-19 14:23:29+01:00, jonas@stripped +1 -1
    fix changed interface

  storage/ndb/src/kernel/main.cpp@stripped, 2006-12-19 14:23:29+01:00, jonas@stripped +1 -1
    fix changed interface

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2006-12-19 14:23:29+01:00, jonas@stripped +1 -1
    fix changed interface

  storage/ndb/src/mgmsrv/MgmtSrvr.hpp@stripped, 2006-12-19 14:23:29+01:00, jonas@stripped +1 -1
    fix changed interface

  storage/ndb/src/mgmsrv/Services.cpp@stripped, 2006-12-19 14:23:29+01:00, jonas@stripped +3 -2
    fix changed interface

# 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-telco

--- 1.38/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-12-19 14:23:36 +01:00
+++ 1.39/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-12-19 14:23:36 +01:00
@@ -230,7 +230,7 @@
 
   // Print the event info
   g_eventLogger.log(eventReport->getEventType(), 
-		    signal->theData, signal->getLength());
+		    signal->theData, signal->getLength(), 0, 0);
   
   return;
 }//execEVENT_REP()

--- 1.61/storage/ndb/src/kernel/main.cpp	2006-12-19 14:23:36 +01:00
+++ 1.62/storage/ndb/src/kernel/main.cpp	2006-12-19 14:23:36 +01:00
@@ -181,7 +181,7 @@
 
   { // Log event
     const EventReport * const eventReport = (EventReport *)&theData[0];
-    g_eventLogger.log(eventReport->getEventType(), theData,
+    g_eventLogger.log(eventReport->getEventType(), theData, length,
 		      eventReport->getNodeId(), 0);
   }
 

--- 1.114/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-12-19 14:23:36 +01:00
+++ 1.115/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-12-19 14:23:36 +01:00
@@ -2461,7 +2461,7 @@
   // Log event
   g_eventLogger.log(type, theData, len, nodeId, 
 		    &m_event_listner[0].m_logLevel);  
-  m_event_listner.log(type, theData, nodeId);
+  m_event_listner.log(type, theData, len, nodeId);
 }
 
 /***************************************************************************

--- 1.51/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2006-12-19 14:23:36 +01:00
+++ 1.52/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2006-12-19 14:23:36 +01:00
@@ -67,7 +67,7 @@
   void update_max_log_level(const LogLevel&);
   void update_log_level(const LogLevel&);
   
-  void log(int eventType, const Uint32* theData, NodeId nodeId);
+  void log(int eventType, const Uint32* theData, Uint32 len, NodeId nodeId);
   
   void stop_sessions();
 

--- 1.83/storage/ndb/src/mgmsrv/Services.cpp	2006-12-19 14:23:36 +01:00
+++ 1.84/storage/ndb/src/mgmsrv/Services.cpp	2006-12-19 14:23:36 +01:00
@@ -1344,7 +1344,8 @@
 }
 
 void
-Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, NodeId nodeId){
+Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, 
+			    Uint32 len, NodeId nodeId){
   
   Uint32 threshold;
   LogLevel::EventCategory cat;
@@ -1359,7 +1360,7 @@
 
   char m_text[512];
   EventLogger::getText(m_text, sizeof(m_text),
-		       textF, theData, nodeId);
+		       textF, theData, len, nodeId);
 
   BaseString str("log event reply\n");
   str.appfmt("type=%d\n", eventType);