From: Date: April 11 2007 10:32am
Subject: bk commit into 5.1 tree (Justin.He:1.2552) BUG#27640
List-Archive: http://lists.mysql.com/commits/24260
X-Bug: 27640
Message-Id: <200704110832.l3B8Wvhn029032@dev3-240.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-04-11 16:32:50+08:00, Justin.He@stripped +1 -0
  Bug#27640, Backup id not displayed in the output of "ndb_mgm start backup wait completed"
  this patch is for 5.1 only

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2007-04-11 16:32:47+08:00, Justin.He@stripped +4 -4
    add filtering '<PING>'
    remove goto related

# 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:	Justin.He
# Host:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb-bj

--- 1.89/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2007-04-11 16:32:57 +08:00
+++ 1.90/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2007-04-11 16:32:57 +08:00
@@ -2494,8 +2494,6 @@
   if (sz == 2 && args[1] == "NOWAIT")
   {
     flags = 0;
-    result = ndb_mgm_start_backup(m_mgmsrv, 0, &backupId, &reply);
-    goto END_BACKUP;
   }
   else if (sz == 1 || (sz == 3 && args[1] == "WAIT" && args[2] == "COMPLETED"))
   {
@@ -2529,7 +2527,6 @@
   }
   result = ndb_mgm_start_backup(m_mgmsrv, flags, &backupId, &reply);
 
-END_BACKUP:
   if (result != 0) {
     ndbout << "Backup failed" << endl;
     printError();
@@ -2550,7 +2547,10 @@
 	tmp = in.gets(buf, 1024);
 	if(tmp)
 	{
-	  ndbout << tmp;
+         const char ping_token[]="<PING>";
+         if(memcmp(ping_token,tmp,sizeof(ping_token)-1)) 
+           if(tmp && strlen(tmp)) 
+             ndbout << tmp;
 	  unsigned int id;
 	  if(sscanf(tmp, "%*[^:]: Backup %d ", &id) == 1 && id == backupId){
 	    count++;