bk commit into 5.1 tree (tomas:1.1968) BUG#15215

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.1968 06/01/18 11:37:53 tomas@stripped[tomas] +2 -0
  BUG#15215

  storage/ndb/src/mgmapi/mgmapi.cpp
    1.59 06/01/18 11:37:47 tomas@stripped[tomas] +7 -1
    BUG#15215

  storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.33 06/01/18 11:37:47 tomas@stripped[tomas] +8 -1
    BUG#15215

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.32/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2005-09-15 12:30:49 +02:00
+++ 1.33/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2006-01-18 11:37:47 +01:00
@@ -342,14 +342,21 @@
 Uint32
 ConfigRetriever::allocNodeId(int no_retries, int retry_delay_in_seconds)
 {
+  int res;
   _ownNodeId= 0;
   if(m_handle != 0)
   {
     while (1)
     {
-      int res= ndb_mgm_alloc_nodeid(m_handle, m_version, m_node_type);
+      if(!ndb_mgm_is_connected(m_handle))
+	if(!ndb_mgm_connect(m_handle, 0, 0, 0))
+	  goto next;
+
+      res= ndb_mgm_alloc_nodeid(m_handle, m_version, m_node_type);
       if(res >= 0)
 	return _ownNodeId= (Uint32)res;
+
+  next:
       if (no_retries == 0)
 	break;
       no_retries--;

--- 1.58/storage/ndb/src/mgmapi/mgmapi.cpp	2005-10-07 10:58:07 +02:00
+++ 1.59/storage/ndb/src/mgmapi/mgmapi.cpp	2006-01-18 11:37:47 +01:00
@@ -336,10 +336,16 @@
   const Properties* p = parser.parse(ctx, session);
   if (p == NULL){
     if(!ndb_mgm_is_connected(handle)) {
-      return NULL;
+      DBUG_RETURN(NULL);
     }
     else
     {
+      if(ctx.m_status==Parser_t::Eof
+	 || ctx.m_status==Parser_t::NoLine)
+      {
+	ndb_mgm_disconnect(handle);
+	DBUG_RETURN(NULL);
+      }
       /**
        * Print some info about why the parser returns NULL
        */