bk commit into 5.0 tree (dli:1.2288)

[David Li]

Below is the list of changes that have just been committed into a local
5.0 repository of dli. When dli 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-04 10:24:09+08:00, dli@stripped +1 -0
  Merge dli@stripped:/home/bk/mysql-5.0-ndb-bj
  into  ts3-3.ts.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
  MERGE: 1.2256.1.2

  ndb/src/mgmsrv/Services.cpp@stripped, 2006-12-04 10:23:43+08:00, dli@stripped +1 -1
    MERGE: 1.70.1.1

# 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:	dli
# Host:	ts3-3.ts.cn.tlan
# Root:	/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj/RESYNC

--- 1.71/ndb/src/mgmsrv/Services.cpp	2006-12-04 10:24:19 +08:00
+++ 1.72/ndb/src/mgmsrv/Services.cpp	2006-12-04 10:24:19 +08:00
@@ -1337,7 +1337,7 @@ Ndb_mgmd_event_service::log(int eventTyp
   if (EventLoggerBase::event_lookup(eventType,cat,threshold,severity,textF))
     DBUG_VOID_RETURN;
 
-  char m_text[512];
+  char m_text[256];
   EventLogger::getText(m_text, sizeof(m_text),
 		       textF, theData, nodeId);
 
@@ -1353,15 +1353,6 @@ Ndb_mgmd_event_service::log(int eventTyp
     if (ndb_logevent_body[i].index_fn)
       val= (*(ndb_logevent_body[i].index_fn))(val);
     str.appfmt("%s=%d\n",ndb_logevent_body[i].token, val);
-    if(strcmp(ndb_logevent_body[i].token,"error") == 0)
-    {
-      int m_text_len= strlen(m_text);
-      if(sizeof(m_text)-m_text_len-3 > 0)
-      {
-        BaseString::snprintf(m_text+m_text_len, 4 , " - ");
-        ndb_error_string(val, m_text+(m_text_len+3), sizeof(m_text)-m_text_len-3);
-      }
-    }
   }
 
   Vector<NDB_SOCKET_TYPE> copy;