bk commit into 5.1 tree (holyfoot:1.2505)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-30 01:06:16+05:00, holyfoot@stripped +1 -0
  'no DBUG_RETURN' warning fixed

  storage/ndb/src/mgmapi/mgmapi.cpp@stripped, 2007-04-30 01:06:13+05:00, holyfoot@stripped +4
-4
    DBUG_ENTER requires DBUG_CHECK_TIMEDOUT_RET

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/d2/hf/mrg/mysql-5.1-opt

--- 1.93/storage/ndb/src/mgmapi/mgmapi.cpp	2007-04-30 01:06:20 +05:00
+++ 1.94/storage/ndb/src/mgmapi/mgmapi.cpp	2007-04-30 01:06:20 +05:00
@@ -394,7 +394,7 @@ ndb_mgm_call(NdbMgmHandle handle, const 
   }
   out.println("");
 
-  CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+  DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
 
   Parser_t::Context ctx;
   ParserDummy session(handle->socket);
@@ -403,7 +403,7 @@ ndb_mgm_call(NdbMgmHandle handle, const 
   const Properties* p = parser.parse(ctx, session);
   if (p == NULL){
     if(!ndb_mgm_is_connected(handle)) {
-      CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+      DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
       DBUG_RETURN(NULL);
     }
     else
@@ -413,7 +413,7 @@ ndb_mgm_call(NdbMgmHandle handle, const 
 	 || ctx.m_status==Parser_t::NoLine)
       {
 	ndb_mgm_disconnect(handle);
-        CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+        DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
 	DBUG_RETURN(NULL);
       }
       /**
@@ -438,7 +438,7 @@ ndb_mgm_call(NdbMgmHandle handle, const 
 
   if(p && (in.timedout() || out.timedout()))
     delete p;
-  CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+  DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
   DBUG_RETURN(p);
 }