From: Date: June 15 2007 4:35pm
Subject: bk commit into 5.1 tree (lzhou:1.2510) BUG#27913
List-Archive: http://lists.mysql.com/commits/28837
X-Bug: 27913
Message-Id: <200706151435.l5FEZkL6011560@dev3-63.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of zhl. When zhl 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-15 14:35:27+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#27913 Remove extra 'Unknown' error message when node shutdown

  storage/ndb/src/mgmsrv/Services.cpp@stripped, 2007-06-15 14:35:21+00:00, lzhou@dev3-63.(none) +2 -1
    Remove extra error massage when node shutdown

# 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:	lzhou
# Host:	dev3-63.(none)
# Root:	/home/zhl/mysql/mysql-5.1/bug27913

--- 1.94/storage/ndb/src/mgmsrv/Services.cpp	2007-06-15 14:35:46 +00:00
+++ 1.95/storage/ndb/src/mgmsrv/Services.cpp	2007-06-15 14:35:46 +00:00
@@ -1320,7 +1320,8 @@ 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)
+    if(ndb_logevent_body[i].type == NDB_LE_BackupAborted &&
+       strcmp(ndb_logevent_body[i].token,"error") == 0)
     {
       int m_text_len= strlen(m_text);
       if(sizeof(m_text)-m_text_len-3 > 0)