Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt

ndb/include/ndbapi/Ndb.hpp

@@ -1051,6 +1051,18 @@ class Ndb
   friend class NdbDictionaryImpl;
   friend class NdbDictInterface;
   friend class NdbBlob;
+  friend class Ndb_free_list_t<NdbRecAttr>;  
+  friend class Ndb_free_list_t<NdbApiSignal>;
+  friend class Ndb_free_list_t<NdbLabel>;
+  friend class Ndb_free_list_t<NdbBranch>;
+  friend class Ndb_free_list_t<NdbSubroutine>;
+  friend class Ndb_free_list_t<NdbCall>;
+  friend class Ndb_free_list_t<NdbBlob>;
+  friend class Ndb_free_list_t<NdbReceiver>;
+  friend class Ndb_free_list_t<NdbIndexScanOperation>;
+  friend class Ndb_free_list_t<NdbOperation>;
+  friend class Ndb_free_list_t<NdbIndexOperation>;
+  friend class Ndb_free_list_t<NdbTransaction>;
 #endif
 
 public:
@@ -1091,7 +1103,7 @@ public:
    *
    * @param aCatalogName is the new name of the current catalog
    */
-  void setCatalogName(const char * aCatalogName);
+  int setCatalogName(const char * aCatalogName);
 
   /**
    * The current schema name can be fetched by getSchemaName.
@@ -1105,7 +1117,7 @@ public:
    *
    * @param aSchemaName is the new name of the current schema
    */
-  void setSchemaName(const char * aSchemaName);
+  int setSchemaName(const char * aSchemaName);
 #endif
 
   /**
@@ -1120,7 +1132,7 @@ public:
    *
    * @param aDatabaseName is the new name of the current database
    */
-  void setDatabaseName(const char * aDatabaseName);
+  int setDatabaseName(const char * aDatabaseName);
 
   /**
    * The current database schema name can be fetched by getDatabaseSchemaName.
@@ -1134,7 +1146,7 @@ public:
    *
    * @param aDatabaseSchemaName is the new name of the current database schema
    */
-  void setDatabaseSchemaName(const char * aDatabaseSchemaName);
+  int setDatabaseSchemaName(const char * aDatabaseSchemaName);
 
   /**
    * Initializes the Ndb object

ndb/include/ndbapi/NdbDictionary.hpp

@@ -358,7 +358,7 @@ public:
      * Set name of column
      * @param  name  Name of the column
      */
-    void setName(const char * name);
+    int setName(const char * name);
 
     /**
      * Set whether column is nullable or not
@@ -446,7 +446,7 @@ public:
     void setAutoIncrement(bool);
     bool getAutoIncrement() const;
     void setAutoIncrementInitialValue(Uint64 val);
-    void setDefaultValue(const char*);   
+    int setDefaultValue(const char*);   
     const char* getDefaultValue() const;
 
     static const Column * FRAGMENT;
@@ -661,13 +661,13 @@ public:
      * Name of table
      * @param  name  Name of table
      */
-    void setName(const char * name);
+    int setName(const char * name);
 
     /**
      * Add a column definition to a table
      * @note creates a copy
      */
-    void addColumn(const Column &);
+    int addColumn(const Column &);
     
     /**
      * @see NdbDictionary::Table::getLogging.
@@ -723,7 +723,7 @@ public:
     /**
      * Set frm file to store with this table
      */ 
-    void setFrm(const void* data, Uint32 len);
+    int setFrm(const void* data, Uint32 len);
 
     /**
      * Set table object type
@@ -875,26 +875,26 @@ public:
     /**
      * Set the name of an index
      */
-    void setName(const char * name);
+    int setName(const char * name);
 
     /**
      * Define the name of the table to be indexed
      */
-    void setTable(const char * name);
+    int setTable(const char * name);
 
     /**
      * Add a column to the index definition
      * Note that the order of columns will be in
      * the order they are added (only matters for ordered indexes).
      */
-    void addColumn(const Column & c);
+    int addColumn(const Column & c);
 
     /**
      * Add a column name to the index definition
      * Note that the order of indexes will be in
      * the order they are added (only matters for ordered indexes).
      */
-    void addColumnName(const char * name);
+    int addColumnName(const char * name);
 
 #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
     /**
@@ -903,7 +903,7 @@ public:
      * the order they are added (only matters for ordered indexes).
      * Depricated, use addColumnName instead.
      */
-    void addIndexColumn(const char * name);
+    int addIndexColumn(const char * name);
 #endif
 
     /**
@@ -911,7 +911,7 @@ public:
      * Note that the order of indexes will be in
      * the order they are added (only matters for ordered indexes).
      */
-    void addColumnNames(unsigned noOfNames, const char ** names);
+    int  addColumnNames(unsigned noOfNames, const char ** names);
 
 #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
     /**
@@ -920,7 +920,7 @@ public:
      * the order they are added (only matters for ordered indexes).
      * Depricated, use addColumnNames instead.
      */
-    void addIndexColumns(int noOfNames, const char ** names);
+    int addIndexColumns(int noOfNames, const char ** names);
 #endif
 
     /**

ndb/include/ndbapi/NdbReceiver.hpp

@@ -38,7 +38,7 @@ public:
   };
   
   NdbReceiver(Ndb *aNdb);
-  void init(ReceiverType type, void* owner);
+  int init(ReceiverType type, void* owner);
   void release();
   ~NdbReceiver();
   
@@ -75,7 +75,7 @@ private:
    * At setup
    */
   class NdbRecAttr * getValue(const class NdbColumnImpl*, char * user_dst_ptr);
-  void do_get_value(NdbReceiver*, Uint32 rows, Uint32 key_size, Uint32 range);
+  int do_get_value(NdbReceiver*, Uint32 rows, Uint32 key_size, Uint32 range);
   void prepareSend();
   void calculate_batch_size(Uint32, Uint32, Uint32&, Uint32&, Uint32&);
 

ndb/include/ndbapi/NdbTransaction.hpp

@@ -585,7 +585,7 @@ private:
   NdbTransaction(Ndb* aNdb); 
   ~NdbTransaction();
 
-  void init();           // Initialize connection object for new transaction
+  int init();           // Initialize connection object for new transaction
 
   int executeNoBlobs(ExecType execType, 
 	             AbortOption abortOption = AbortOnError,

ndb/include/util/BaseString.hpp

@@ -185,6 +185,7 @@ public:
 private:
   char* m_chr;
   unsigned m_len;
+  friend bool operator!(const BaseString& str);
 };
 
 inline const char*
@@ -249,6 +250,12 @@ BaseString::operator!=(const char *str) const
     return strcmp(m_chr, str) != 0;
 }
 
+inline bool
+operator!(const BaseString& str)
+{
+    return str.m_chr == NULL;
+}
+
 inline BaseString&
 BaseString::assign(const BaseString& str)
 {

ndb/include/util/Vector.hpp

@@ -29,14 +29,14 @@ public:
   const T& operator[](unsigned i) const;
   unsigned size() const { return m_size; };
   
-  void push_back(const T &);
+  int push_back(const T &);
   T& back();
   
   void erase(unsigned index);
   
   void clear();
   
-  void fill(unsigned new_size, T & obj);
+  int fill(unsigned new_size, T & obj);
 
   Vector<T>& operator=(const Vector<T>&);
 
@@ -52,6 +52,14 @@ private:
 template<class T>
 Vector<T>::Vector(int i){
   m_items = new T[i];
+  if (m_items == NULL)
+  {
+    errno = ENOMEM;
+    m_size = 0;
+    m_arraySize = 0;
+    m_incSize = 0;
+    return;
+  }
   m_size = 0;
   m_arraySize = i;
   m_incSize = 50;
@@ -89,12 +97,15 @@ Vector<T>::back(){
 }
 
 template<class T>
-void
+int
 Vector<T>::push_back(const T & t){
   if(m_size == m_arraySize){
     T * tmp = new T [m_arraySize + m_incSize];
-    if(!tmp)
-      abort();
+    if(tmp == NULL)
+    {
+      errno = ENOMEM;
+      return -1;
+    }
     for (unsigned k = 0; k < m_size; k++)
       tmp[k] = m_items[k];
     delete[] m_items;
@@ -103,6 +114,8 @@ Vector<T>::push_back(const T & t){
   }
   m_items[m_size] = t;
   m_size++;
+
+  return 0;
 }
 
 template<class T>
@@ -123,10 +136,12 @@ Vector<T>::clear(){
 }
 
 template<class T>
-void 
+int
 Vector<T>::fill(unsigned new_size, T & obj){
   while(m_size <= new_size)
-    push_back(obj);
+    if (push_back(obj))
+      return -1;
+  return 0;
 }
 
 template<class T>
@@ -150,8 +165,8 @@ struct MutexVector : public NdbLockable {
   const T& operator[](unsigned i) const;
   unsigned size() const { return m_size; };
   
-  void push_back(const T &);
-  void push_back(const T &, bool lockMutex);
+  int push_back(const T &);
+  int push_back(const T &, bool lockMutex);
   T& back();
   
   void erase(unsigned index);
@@ -160,7 +175,7 @@ struct MutexVector : public NdbLockable {
   void clear();
   void clear(bool lockMutex);
 
-  void fill(unsigned new_size, T & obj);
+  int fill(unsigned new_size, T & obj);
 private:
   T * m_items;
   unsigned m_size;
@@ -171,6 +186,14 @@ private:
 template<class T>
 MutexVector<T>::MutexVector(int i){
   m_items = new T[i];
+  if (m_items == NULL)
+  {
+    errno = ENOMEM;
+    m_size = 0;
+    m_arraySize = 0;
+    m_incSize = 0;
+    return;
+  }
   m_size = 0;
   m_arraySize = i;
   m_incSize = 50;
@@ -208,11 +231,17 @@ MutexVector<T>::back(){
 }
 
 template<class T>
-void
+int
 MutexVector<T>::push_back(const T & t){
   lock();
   if(m_size == m_arraySize){
     T * tmp = new T [m_arraySize + m_incSize];
+    if (tmp == NULL)
+    {
+      errno = ENOMEM;
+      unlock();
+      return -1;
+    }
     for (unsigned k = 0; k < m_size; k++)
       tmp[k] = m_items[k];
     delete[] m_items;
@@ -222,15 +251,23 @@ MutexVector<T>::push_back(const T & t){
   m_items[m_size] = t;
   m_size++;
   unlock();
+  return 0;
 }
 
 template<class T>
-void
+int
 MutexVector<T>::push_back(const T & t, bool lockMutex){
   if(lockMutex) 
     lock();
   if(m_size == m_arraySize){
     T * tmp = new T [m_arraySize + m_incSize];
+    if (tmp == NULL)
+    {
+      errno = ENOMEM;
+      if(lockMutex) 
+        unlock();
+      return -1;
+    }
     for (unsigned k = 0; k < m_size; k++)
       tmp[k] = m_items[k];
     delete[] m_items;
@@ -241,6 +278,7 @@ MutexVector<T>::push_back(const T & t, bool lockMutex){
   m_size++;
   if(lockMutex)
     unlock();
+  return 0;
 }
 
 template<class T>
@@ -288,10 +326,12 @@ MutexVector<T>::clear(bool l){
 }
 
 template<class T>
-void 
+int
 MutexVector<T>::fill(unsigned new_size, T & obj){
   while(m_size <= new_size)
-    push_back(obj);
+    if (push_back(obj))
+      return -1;
+  return 0;
 }
 
 #endif

ndb/src/common/util/BaseString.cpp

@@ -16,19 +16,36 @@
 /* -*- c-basic-offset: 4; -*- */
 #include <ndb_global.h>
 #include <BaseString.hpp>
-#include <basestring_vsnprintf.h>
+#include "basestring_vsnprintf.h"
 
 BaseString::BaseString()
 {
     m_chr = new char[1];
+    if (m_chr == NULL)
+    {
+      errno = ENOMEM;
+      m_len = 0;
+      return;
+    }
     m_chr[0] = 0;
     m_len = 0;
 }
 
 BaseString::BaseString(const char* s)
 {
+    if (s == NULL)
+    {
+      m_chr = NULL;
+      m_len = 0;
+    }
     const size_t n = strlen(s);
     m_chr = new char[n + 1];
+    if (m_chr == NULL)
+    {
+      errno = ENOMEM;
+      m_len = 0;
+      return;
+    }
     memcpy(m_chr, s, n + 1);
     m_len = n;
 }
@@ -37,7 +54,20 @@ BaseString::BaseString(const BaseString& str)
 {
     const char* const s = str.m_chr;
     const size_t n = str.m_len;
+    if (s == NULL)
+    {
+      m_chr = NULL;
+      m_len = 0;
+      return;
+    }
     char* t = new char[n + 1];
+    if (t == NULL)
+    {
+      errno = ENOMEM;
+      m_chr = NULL;
+      m_len = 0;
+      return;
+    }
     memcpy(t, s, n + 1);
     m_chr = t;
     m_len = n;
@@ -51,9 +81,23 @@ BaseString::~BaseString()
 BaseString&
 BaseString::assign(const char* s)
 {
-    const size_t n = strlen(s);
+    if (s == NULL)
+    {
+      m_chr = NULL;
+      m_len = 0;
+      return *this;
+    }
+    size_t n = strlen(s);
     char* t = new char[n + 1];
-    memcpy(t, s, n + 1);
+    if (t)
+    {
+      memcpy(t, s, n + 1);
+    }
+    else
+    {
+      errno = ENOMEM;
+      n = 0;
+    }
     delete[] m_chr;
     m_chr = t;
     m_len = n;
@@ -64,8 +108,16 @@ BaseString&
 BaseString::assign(const char* s, size_t n)
 {
     char* t = new char[n + 1];
-    memcpy(t, s, n);
-    t[n] = 0;
+    if (t)
+    {
+      memcpy(t, s, n);
+      t[n] = 0;
+    }
+    else
+    {
+      errno = ENOMEM;
+      n = 0;
+    }
     delete[] m_chr;
     m_chr = t;
     m_len = n;
@@ -83,10 +135,19 @@ BaseString::assign(const BaseString& str, size_t n)
 BaseString&
 BaseString::append(const char* s)
 {
-    const size_t n = strlen(s);
+    size_t n = strlen(s);
     char* t = new char[m_len + n + 1];
-    memcpy(t, m_chr, m_len);
-    memcpy(t + m_len, s, n + 1);
+    if (t)
+    {
+      memcpy(t, m_chr, m_len);
+      memcpy(t + m_len, s, n + 1);
+    }
+    else
+    {
+      errno = ENOMEM;
+      m_len = 0;
+      n = 0;
+    }
     delete[] m_chr;
     m_chr = t;
     m_len += n;
@@ -130,8 +191,14 @@ BaseString::assfmt(const char *fmt, ...)
     l = basestring_vsnprintf(buf, sizeof(buf), fmt, ap) + 1;
     va_end(ap);
     if(l > (int)m_len) {
+        char *t = new char[l];
+        if (t == NULL)
+        {
+          errno = ENOMEM;
+          return *this;
+        }
 	delete[] m_chr;
-	m_chr = new char[l];
+	m_chr = t;
     }
     va_start(ap, fmt);
     basestring_vsnprintf(m_chr, l, fmt, ap);
@@ -155,6 +222,11 @@ BaseString::appfmt(const char *fmt, ...)
     l = basestring_vsnprintf(buf, sizeof(buf), fmt, ap) + 1;
     va_end(ap);
     char *tmp = new char[l];
+    if (tmp == NULL)
+    {
+      errno = ENOMEM;
+      return *this;
+    }
     va_start(ap, fmt);
     basestring_vsnprintf(tmp, l, fmt, ap);
     va_end(ap);
@@ -242,9 +314,28 @@ BaseString::argify(const char *argv0, const char *src) {
     Vector<char *> vargv;
     
     if(argv0 != NULL)
-	vargv.push_back(strdup(argv0));
+    {
+      char *t = strdup(argv0);
+      if (t == NULL)
+      {
+        errno = ENOMEM;
+        return NULL;
+      }
+      if (vargv.push_back(t))
+      {
+        free(t);
+        return NULL;
+      }
+    }
     
     char *tmp = new char[strlen(src)+1];
+    if (tmp == NULL)
+    {
+      for(size_t i = 0; i < vargv.size(); i++)
+        free(vargv[i]);
+      errno = ENOMEM;
+      return NULL;
+    }
     char *dst = tmp;
     const char *end = src + strlen(src);
     /* Copy characters from src to destination, while compacting them
@@ -287,20 +378,48 @@ BaseString::argify(const char *argv0, const char *src) {
 	/* Make sure the string is properly terminated */
 	*dst++ = '\0';
 	src++;
-	
-	vargv.push_back(strdup(begin));
+
+        {
+          char *t = strdup(begin);
+          if (t == NULL)
+          {
+            delete[] tmp;
+            for(size_t i = 0; i < vargv.size(); i++)
+              free(vargv[i]);
+            errno = ENOMEM;
+            return NULL;
+          }
+          if (vargv.push_back(t))
+          {
+            free(t);
+            delete[] tmp;
+            for(size_t i = 0; i < vargv.size(); i++)
+              free(vargv[i]);
+            return NULL;
+          }
+        }
     }
  end:
     
     delete[] tmp;
-    vargv.push_back(NULL);
+    if (vargv.push_back(NULL))
+    {
+      for(size_t i = 0; i < vargv.size(); i++)
+        free(vargv[i]);
+      return NULL;
+    }
     
     /* Convert the C++ Vector into a C-vector of strings, suitable for
      * calling execv().
      */
     char **argv = (char **)malloc(sizeof(*argv) * (vargv.size()));
     if(argv == NULL)
+    {
+        for(size_t i = 0; i < vargv.size(); i++)
+          free(vargv[i]);
+        errno = ENOMEM;
 	return NULL;
+    }
     
     for(size_t i = 0; i < vargv.size(); i++){
 	argv[i] = vargv[i];

ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp

@@ -389,6 +389,7 @@ Dbtup::commitRecord(Signal* signal,
 
   fragptr.p = regFragPtr;
   tabptr.p = regTabPtr;
+  Uint32 hashValue = firstOpPtr.p->hashValue;
 
   if (opType == ZINSERT_DELETE) {
     ljam();
@@ -411,6 +412,7 @@ Dbtup::commitRecord(Signal* signal,
 //--------------------------------------------------------------------
     Uint32 saveOpType = regOperPtr->optype;
     regOperPtr->optype = ZINSERT;
+    regOperPtr->hashValue = hashValue;
     operPtr.p = regOperPtr;
 
     checkDetachedTriggers(signal,
@@ -443,6 +445,8 @@ Dbtup::commitRecord(Signal* signal,
     befOpPtr.p->changeMask.clear();
     befOpPtr.p->changeMask.bitOR(attributeMask);
     befOpPtr.p->gci = regOperPtr->gci;
+    befOpPtr.p->optype = ZUPDATE;
+    befOpPtr.p->hashValue = hashValue;
     
     befOpPtr.p->optype = opType;
     operPtr.p = befOpPtr.p;
@@ -477,11 +481,13 @@ Dbtup::commitRecord(Signal* signal,
     Uint32 fragPageId = befOpPtr.p->fragPageId;
     Uint32 pageIndex  = befOpPtr.p->pageIndex;
 
+    befOpPtr.p->optype = ZDELETE;
     befOpPtr.p->realPageId = befOpPtr.p->realPageIdC;
     befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC;
     befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC;
     befOpPtr.p->pageIndex  = befOpPtr.p->pageIndexC;
     befOpPtr.p->gci = regOperPtr->gci;
+    befOpPtr.p->hashValue = hashValue;
 
     befOpPtr.p->optype = opType;
     operPtr.p = befOpPtr.p;

ndb/src/ndbapi/DictCache.cpp

@@ -141,7 +141,7 @@ void GlobalDictCache::printCache()
 }
 
 NdbTableImpl *
-GlobalDictCache::get(const char * name)
+GlobalDictCache::get(const char * name, int *error)
 {
   DBUG_ENTER("GlobalDictCache::get");
   DBUG_PRINT("enter", ("name: %s", name));
@@ -151,6 +151,11 @@ GlobalDictCache::get(const char * name)
   versions = m_tableHash.getData(name, len);
   if(versions == 0){
     versions = new Vector<TableVersion>(2);
+    if (versions == NULL)
+    {
+      *error = -1;
+      DBUG_RETURN(0);
+    }
     m_tableHash.insertKey(name, len, 0, versions);
   }
 
@@ -180,7 +185,11 @@ GlobalDictCache::get(const char * name)
   tmp.m_impl = 0;
   tmp.m_status = RETREIVING;
   tmp.m_refCount = 1; // The one retreiving it
-  versions->push_back(tmp);
+  if (versions->push_back(tmp))
+  {
+    *error = -1;
+    DBUG_RETURN(0);
+  }
   DBUG_RETURN(0);
 }
 

ndb/src/ndbapi/DictCache.hpp

@@ -67,7 +67,7 @@ public:
   GlobalDictCache();
   ~GlobalDictCache();
   
-  NdbTableImpl * get(const char * name);
+  NdbTableImpl * get(const char * name, int *error);
   
   NdbTableImpl* put(const char * name, NdbTableImpl *);
   void drop(NdbTableImpl *);

ndb/src/ndbapi/Makefile.am

@@ -48,7 +48,8 @@ libndbapi_la_SOURCES = \
         DictCache.cpp \
         ndb_cluster_connection.cpp \
 	NdbBlob.cpp \
-        SignalSender.cpp
+        SignalSender.cpp \
+        ObjectMap.cpp
 
 INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
 

ndb/src/ndbapi/Ndb.cpp

@@ -182,6 +182,7 @@ Ndb::NDB_connect(Uint32 tNode)
     nodeSequence = tp->getNodeSequence(tNode);
     bool node_is_alive = tp->get_node_alive(tNode);
     if (node_is_alive) { 
+      DBUG_PRINT("info",("Sending signal to node %u", tNode));
       tReturnCode = tp->sendSignal(tSignal, tNode);  
       releaseSignal(tSignal); 
       if (tReturnCode != -1) {
@@ -449,7 +450,11 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId)
 
   theRemainingStartTransactions--;
   NdbTransaction* tConNext = theTransactionList;
-  tConnection->init();
+  if (tConnection->init())
+  {
+    theError.code = tConnection->theError.code;
+    DBUG_RETURN(NULL);
+  }
   theTransactionList = tConnection;        // into a transaction list.
   tConnection->next(tConNext);   // Add the active connection object
   tConnection->setTransactionId(tFirstTransId);
@@ -1129,28 +1134,37 @@ const char * Ndb::getCatalogName() const
 }
 
 
-void Ndb::setCatalogName(const char * a_catalog_name)
+int Ndb::setCatalogName(const char * a_catalog_name)
 {
   if (a_catalog_name)
   {
-    theImpl->m_dbname.assign(a_catalog_name);
-    theImpl->update_prefix();
+    if (!theImpl->m_dbname.assign(a_catalog_name) ||
+        theImpl->update_prefix())
+    {
+      theError.code = 4000;
+      return -1;
+    }
   }
+  return 0;
 }
 
-
 const char * Ndb::getSchemaName() const
 {
   return theImpl->m_schemaname.c_str();
 }
 
 
-void Ndb::setSchemaName(const char * a_schema_name)
+int Ndb::setSchemaName(const char * a_schema_name)
 {
   if (a_schema_name) {
-    theImpl->m_schemaname.assign(a_schema_name);
-    theImpl->update_prefix();
+    if (!theImpl->m_schemaname.assign(a_schema_name) ||
+        theImpl->update_prefix())
+    {
+      theError.code = 4000;
+      return -1;
+    }
   }
+  return 0;
 }
  
 /*
@@ -1161,9 +1175,9 @@ const char * Ndb::getDatabaseName() const
   return getCatalogName();
 }
  
-void Ndb::setDatabaseName(const char * a_catalog_name)
+int Ndb::setDatabaseName(const char * a_catalog_name)
 {
-  setCatalogName(a_catalog_name);
+  return setCatalogName(a_catalog_name);
 }
  
 const char * Ndb::getDatabaseSchemaName() const
@@ -1171,9 +1185,9 @@ const char * Ndb::getDatabaseSchemaName() const
   return getSchemaName();
 }
  
-void Ndb::setDatabaseSchemaName(const char * a_schema_name)
+int Ndb::setDatabaseSchemaName(const char * a_schema_name)
 {
-  setSchemaName(a_schema_name);
+  return setSchemaName(a_schema_name);
 }
  
 bool Ndb::usingFullyQualifiedNames()
@@ -1287,6 +1301,11 @@ const BaseString
 Ndb::getDatabaseFromInternalName(const char * internalName)
 {
   char * databaseName = new char[strlen(internalName) + 1];
+  if (databaseName == NULL)
+  {
+    errno = ENOMEM;
+    return BaseString(NULL);
+  }
   strcpy(databaseName, internalName);
   register char *ptr = databaseName;
    
@@ -1303,6 +1322,11 @@ const BaseString
 Ndb::getSchemaFromInternalName(const char * internalName)
 {
   char * schemaName = new char[strlen(internalName)];
+  if (schemaName == NULL)
+  {
+    errno = ENOMEM;
+    return BaseString(NULL);
+  }
   register const char *ptr1 = internalName;
    
   /* Scan name for the second table_name_separator */

ndb/src/ndbapi/NdbDictionary.cpp

@@ -52,9 +52,9 @@ NdbDictionary::Column::operator=(const NdbDictionary::Column& column)
   return *this;
 }
 
-void 
+int
 NdbDictionary::Column::setName(const char * name){
-  m_impl.m_name.assign(name);
+  return !m_impl.m_name.assign(name);
 }
 
 const char* 
@@ -208,10 +208,10 @@ NdbDictionary::Column::setAutoIncrementInitialValue(Uint64 val){
   m_impl.m_autoIncrementInitialValue = val;
 }
 
-void
+int
 NdbDictionary::Column::setDefaultValue(const char* defaultValue)
 {
-  m_impl.m_defaultValue.assign(defaultValue);
+  return !m_impl.m_defaultValue.assign(defaultValue);
 }
 
 const char*
@@ -273,9 +273,9 @@ NdbDictionary::Table::operator=(const NdbDictionary::Table& table)
   return *this;
 }
 
-void 
+int
 NdbDictionary::Table::setName(const char * name){
-  m_impl.setName(name);
+  return m_impl.setName(name);
 }
 
 const char * 
@@ -288,18 +288,30 @@ NdbDictionary::Table::getTableId() const {
   return m_impl.m_tableId;
 }
 
-void 
+int
 NdbDictionary::Table::addColumn(const Column & c){
   NdbColumnImpl* col = new NdbColumnImpl;
+  if (col ==  NULL)
+  {
+    errno = ENOMEM;
+    return -1;
+  }
   (* col) = NdbColumnImpl::getImpl(c);
-  m_impl.m_columns.push_back(col);
+  if (m_impl.m_columns.push_back(col))
+  {
+    return -1;
+  }
   if(c.getPrimaryKey()){
     m_impl.m_noOfKeys++;
   }
   if (col->getBlobType()) {
     m_impl.m_noOfBlobs++;
   }
-  m_impl.buildColumnHash();
+  if (m_impl.buildColumnHash())
+  {
+    return -1;
+  }
+  return 0;
 }
 
 const NdbDictionary::Column*
@@ -442,9 +454,9 @@ NdbDictionary::Table::setSingleUserMode(enum NdbDictionary::Table::SingleUserMod
   m_impl.m_single_user_mode = (Uint8)mode;
 }
 
-void
+int
 NdbDictionary::Table::setFrm(const void* data, Uint32 len){
-  m_impl.m_frm.assign(data, len);
+  return m_impl.m_frm.assign(data, len);
 }
 
 NdbDictionary::Object::Status
@@ -491,6 +503,7 @@ NdbDictionary::Table::createTableInDb(Ndb* pNdb, bool equalOk) const {
 /*****************************************************************
  * Index facade
  */
+
 NdbDictionary::Index::Index(const char * name)
   : m_impl(* new NdbIndexImpl(* this))
 {
@@ -509,9 +522,9 @@ NdbDictionary::Index::~Index(){
   }
 }
 
-void 
+int
 NdbDictionary::Index::setName(const char * name){
-  m_impl.setName(name);
+  return m_impl.setName(name);
 }
 
 const char * 
@@ -519,9 +532,9 @@ NdbDictionary::Index::getName() const {
   return m_impl.getName();
 }
 
-void 
+int
 NdbDictionary::Index::setTable(const char * table){
-  m_impl.setTable(table);
+  return m_impl.setTable(table);
 }
 
 const char * 
@@ -556,39 +569,56 @@ NdbDictionary::Index::getIndexColumn(int no) const {
     return NULL;
 }
 
-void
+int
 NdbDictionary::Index::addColumn(const Column & c){
   NdbColumnImpl* col = new NdbColumnImpl;
+  if (col == NULL)
+  {
+    errno = ENOMEM;
+    return -1;
+  }
   (* col) = NdbColumnImpl::getImpl(c);
-  m_impl.m_columns.push_back(col);
+  if (m_impl.m_columns.push_back(col))
+  {
+    return -1;
+  }
+  return 0;
 }
 
-void
+int
 NdbDictionary::Index::addColumnName(const char * name){
   const Column c(name);
-  addColumn(c);
+  return addColumn(c);
 }
 
-void
+int
 NdbDictionary::Index::addIndexColumn(const char * name){
   const Column c(name);
-  addColumn(c);
+  return addColumn(c);
 }
 
-void
+int
 NdbDictionary::Index::addColumnNames(unsigned noOfNames, const char ** names){
   for(unsigned i = 0; i < noOfNames; i++) {
     const Column c(names[i]);
-    addColumn(c);
+    if (addColumn(c))
+    {
+      return -1;
+    }
   }
+  return 0;
 }
 
-void
+int
 NdbDictionary::Index::addIndexColumns(int noOfNames, const char ** names){
   for(int i = 0; i < noOfNames; i++) {
     const Column c(names[i]);
-    addColumn(c);
+    if (addColumn(c))
+    {
+      return -1;
+    }
   }
+  return 0;
 }
 
 void

ndb/src/ndbapi/NdbDictionaryImpl.hpp

@@ -103,7 +103,7 @@ public:
   ~NdbTableImpl();
   
   void init();
-  void setName(const char * name);
+  int setName(const char * name);
   const char * getName() const;
 
   Uint32 m_changeMask;
@@ -120,7 +120,7 @@ public:
   Uint32 m_columnHashMask;
   Vector<Uint32> m_columnHash;
   Vector<NdbColumnImpl *> m_columns;
-  void buildColumnHash(); 
+  int buildColumnHash(); 
 
   /**
    * Fragment info
@@ -166,7 +166,7 @@ public:
    * Equality/assign
    */
   bool equal(const NdbTableImpl&) const;
-  void assign(const NdbTableImpl&);
+  int assign(const NdbTableImpl&);
 
   static NdbTableImpl & getImpl(NdbDictionary::Table & t);
   static NdbTableImpl & getImpl(const NdbDictionary::Table & t);
@@ -185,9 +185,9 @@ public:
   ~NdbIndexImpl();
 
   void init();
-  void setName(const char * name);
+  int setName(const char * name);
   const char * getName() const;
-  void setTable(const char * table);
+  int setTable(const char * table);
   const char * getTable() const;
   const NdbTableImpl * getIndexTable() const;
 

ndb/src/ndbapi/NdbImpl.hpp

@@ -37,7 +37,7 @@ struct Ndb_free_list_t
   Ndb_free_list_t();
   ~Ndb_free_list_t();
   
-  void fill(Ndb*, Uint32 cnt);
+  int fill(Ndb*, Uint32 cnt);
   T* seize(Ndb*);
   void release(T*);
   void clear();
@@ -79,10 +79,14 @@ public:
 
   BaseString m_prefix; // Buffer for preformatted internal name <db>/<schema>/
 
-  void update_prefix()
+  int update_prefix()
   {
-    m_prefix.assfmt("%s%c%s%c", m_dbname.c_str(), table_name_separator,
-                    m_schemaname.c_str(), table_name_separator);
+    if (!m_prefix.assfmt("%s%c%s%c", m_dbname.c_str(), table_name_separator,
+                         m_schemaname.c_str(), table_name_separator))
+    {
+      return -1;
+    }
+    return 0;
   }
 
   /**
@@ -194,7 +198,7 @@ Ndb_free_list_t<T>::~Ndb_free_list_t()
     
 template<class T>
 inline
-void
+int
 Ndb_free_list_t<T>::fill(Ndb* ndb, Uint32 cnt)
 {
   if (m_free_list == 0)
@@ -202,18 +206,28 @@ Ndb_free_list_t<T>::fill(Ndb* ndb, Uint32 cnt)
     m_free_cnt++;
     m_alloc_cnt++;
     m_free_list = new T(ndb);
+    if (m_free_list == 0)
+    {
+      ndb->theError.code = 4000;
+      assert(false);
+      return -1;
+    }
   }
   while(m_alloc_cnt < cnt)
   {
     T* obj= new T(ndb);
     if(obj == 0)
-      return;
-    
+    {
+      ndb->theError.code = 4000;
+      assert(false);
+      return -1;
+    }
     obj->next(m_free_list);
     m_free_cnt++;
     m_alloc_cnt++;
     m_free_list = obj;
   }
+  return 0;
 }
 
 template<class T>
@@ -234,7 +248,11 @@ Ndb_free_list_t<T>::seize(Ndb* ndb)
   {
     m_alloc_cnt++;
   }
-  
+  else
+  {
+    ndb->theError.code = 4000;
+    assert(false);
+  }
   return tmp;
 }
 

ndb/src/ndbapi/NdbOperation.cpp

@@ -176,7 +176,11 @@ NdbOperation::init(const NdbTableImpl* tab, NdbTransaction* myConnection){
   tcKeyReq->scanInfo = 0;
   theKEYINFOptr = &tcKeyReq->keyInfo[0];
   theATTRINFOptr = &tcKeyReq->attrInfo[0];
-  theReceiver.init(NdbReceiver::NDB_OPERATION, this);
+  if (theReceiver.init(NdbReceiver::NDB_OPERATION, this))
+  {
+    // theReceiver sets the error code of its owner
+    return -1;
+  }
   return 0;
 }
 

ndb/src/ndbapi/NdbRecAttr.cpp

@@ -83,6 +83,7 @@ NdbRecAttr::setup(const NdbColumnImpl* anAttrInfo, char* aValue)
     theRef = tRef;
     return 0;
   }
+  errno = ENOMEM;
   return -1;
 }
 
@@ -102,7 +103,11 @@ NdbRecAttr::copyout()
 NdbRecAttr *
 NdbRecAttr::clone() const {
   NdbRecAttr * ret = new NdbRecAttr(0);
-
+  if (ret == NULL)
+  {
+    errno = ENOMEM;
+    return NULL;
+  }
   ret->theAttrId = theAttrId;
   ret->theNULLind = theNULLind;
   ret->theAttrSize = theAttrSize;
@@ -116,6 +121,12 @@ NdbRecAttr::clone() const {
     ret->theValue = 0;
   } else {
     ret->theStorageX = new Uint64[((n + 7) >> 3)];
+    if (ret->theStorageX == NULL)
+    {
+      delete ret;
+      errno = ENOMEM;
+      return NULL;
+    }
     ret->theRef = (char*)ret->theStorageX;    
     ret->theValue = 0;
   }

ndb/src/ndbapi/NdbReceiver.cpp

@@ -32,7 +32,7 @@ NdbReceiver::NdbReceiver(Ndb *aNdb) :
 {
   theCurrentRecAttr = theFirstRecAttr = 0;
   m_defined_rows = 0;
-  m_rows = new NdbRecAttr*[0];
+  m_rows = NULL;
 }
  
 NdbReceiver::~NdbReceiver()
@@ -45,19 +45,26 @@ NdbReceiver::~NdbReceiver()
   DBUG_VOID_RETURN;
 }
 
-void
+int
 NdbReceiver::init(ReceiverType type, void* owner)
 {
   theMagicNumber = 0x11223344;
   m_type = type;
   m_owner = owner;
+  theFirstRecAttr = NULL;
+  theCurrentRecAttr = NULL;
   if (m_id == NdbObjectIdMap::InvalidId) {
     if (m_ndb)
+    {
       m_id = m_ndb->theImpl->theNdbObjectIdMap.map(this);
+      if (m_id == NdbObjectIdMap::InvalidId)
+      {
+        setErrorCode(4000);
+        return -1;
+      }
+    }
   }
-
-  theFirstRecAttr = NULL;
-  theCurrentRecAttr = NULL;
+  return 0;
 }
 
 void
@@ -146,7 +153,7 @@ NdbReceiver::calculate_batch_size(Uint32 key_size,
   return;
 }
 
-void
+int
 NdbReceiver::do_get_value(NdbReceiver * org, 
 			  Uint32 rows, 
 			  Uint32 key_size,
@@ -154,7 +161,11 @@ NdbReceiver::do_get_value(NdbReceiver * org,
   if(rows > m_defined_rows){
     delete[] m_rows;
     m_defined_rows = rows;
-    m_rows = new NdbRecAttr*[rows + 1]; 
+    if ((m_rows = new NdbRecAttr*[rows + 1]) == NULL)
+    {
+      setErrorCode(4000);
+      return -1;
+    }
   }
   m_rows[rows] = 0;
   
@@ -174,7 +185,7 @@ NdbReceiver::do_get_value(NdbReceiver * org,
     // Put key-recAttr fir on each row
     if(key_size && !getValue(&key, (char*)0)){
       abort();
-      return ; // -1
+      return -1;
     }
     
     if(range_no && 
@@ -193,7 +204,7 @@ NdbReceiver::do_get_value(NdbReceiver * org,
     
     if(tRecAttr){
       abort();
-      return ;// -1;
+      return -1;
     }
 
     // Store first recAttr for each row in m_rows[i]
@@ -205,7 +216,7 @@ NdbReceiver::do_get_value(NdbReceiver * org,
   } 
 
   prepareSend();
-  return;
+  return 0;
 }
 
 NdbRecAttr*

ndb/src/ndbapi/NdbScanFilter.cpp

@@ -78,7 +78,11 @@ NdbScanFilter::~NdbScanFilter(){
 int
 NdbScanFilter::begin(Group group){
 
-  m_impl.m_stack2.push_back(m_impl.m_negative);
+  if (m_impl.m_stack2.push_back(m_impl.m_negative))
+  {
+    m_impl.m_operation->setErrorCodeAbort(4000);
+    return -1;
+  }
   switch(group){
   case NdbScanFilter::AND:
     INT_DEBUG(("Begin(AND)"));
@@ -127,7 +131,11 @@ NdbScanFilter::begin(Group group){
   }
 
   NdbScanFilterImpl::State tmp = m_impl.m_current;
-  m_impl.m_stack.push_back(m_impl.m_current);
+  if (m_impl.m_stack.push_back(m_impl.m_current))
+  {
+    m_impl.m_operation->setErrorCodeAbort(4000);
+    return -1;
+  }
   m_impl.m_current.m_group = group;
   m_impl.m_current.m_ownLabel = m_impl.m_label++;
   m_impl.m_current.m_popCount = 0;

ndb/src/ndbapi/NdbScanOperation.cpp

@@ -797,9 +797,12 @@ int NdbScanOperation::prepareSendScan(Uint32 aTC_ConnectPtr,
   req->requestInfo = reqInfo;
   
   for(Uint32 i = 0; i<theParallelism; i++){
-    m_receivers[i]->do_get_value(&theReceiver, batch_size, 
-				 key_size, 
-				 m_read_range_no);
+    if (m_receivers[i]->do_get_value(&theReceiver, batch_size, 
+                                     key_size, 
+                                     m_read_range_no))
+    {
+      return -1;
+    }
   }
   return 0;
 }

ndb/src/ndbapi/NdbTransaction.cpp

@@ -81,6 +81,7 @@ NdbTransaction::NdbTransaction( Ndb* aNdb ) :
 {
   theListState = NotInList;
   theError.code = 0;
+  //theId = NdbObjectIdMap::InvalidId;
   theId = theNdb->theImpl->theNdbObjectIdMap.map(this);
 
 #define CHECK_SZ(mask, sz) assert((sizeof(mask)/sizeof(mask[0])) == sz)
@@ -106,7 +107,7 @@ void init();
 
 Remark:         Initialise connection object for new transaction. 
 *****************************************************************************/
-void	
+int
 NdbTransaction::init()
 {
   theListState            = NotInList;
@@ -147,6 +148,17 @@ NdbTransaction::init()
   //
   theBlobFlag = false;
   thePendingBlobOps = 0;
+  if (theId == NdbObjectIdMap::InvalidId)
+  {
+    theId = theNdb->theImpl->theNdbObjectIdMap.map(this);
+    if (theId == NdbObjectIdMap::InvalidId)
+    {
+      theError.code = 4000;
+      return -1;
+    }
+  }
+  return 0;
+
 }//NdbTransaction::init()
 
 /*****************************************************************************

ndb/src/ndbapi/Ndbif.cpp

@@ -816,8 +816,9 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
  InvalidSignal:
 #ifdef VM_TRACE
   ndbout_c("Ndbif: Error Ndb::handleReceivedSignal "
-	   "(GSN=%d, theImpl->theWaiter.m_state=%d)"
+	   "(tFirstDataPtr=%p, GSN=%d, theImpl->theWaiter.m_state=%d)"
 	   " sender = (Block: %d Node: %d)",
+           tFirstDataPtr,
 	   tSignalNumber,
 	   tWaitState,
 	   refToBlock(aSignal->theSendersBlockRef),

ndb/src/ndbapi/Ndblist.cpp

@@ -74,7 +74,10 @@ Ndb::checkFailedNode()
 int 
 Ndb::createConIdleList(int aNrOfCon)
 {
-  theImpl->theConIdleList.fill(this, aNrOfCon);
+  if (theImpl->theConIdleList.fill(this, aNrOfCon))
+  {
+    return -1;
+  }
   return aNrOfCon; 
 }
 
@@ -90,7 +93,10 @@ Ndb::createConIdleList(int aNrOfCon)
 int 
 Ndb::createOpIdleList(int aNrOfOp)
 { 
-  theImpl->theOpIdleList.fill(this, aNrOfOp);
+  if (theImpl->theOpIdleList.fill(this, aNrOfOp))
+  {
+    return -1;
+  }
   return aNrOfOp; 
 }
 

ndb/src/ndbapi/ObjectMap.cpp

+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include "ObjectMap.hpp"
+
+NdbObjectIdMap::NdbObjectIdMap(NdbMutex* mutex, Uint32 sz, Uint32 eSz)
+{
+  m_size = 0;
+  m_firstFree = InvalidId;
+  m_map = 0;
+  m_mutex = mutex;
+  m_expandSize = eSz;
+  expand(sz);
+#ifdef DEBUG_OBJECTMAP
+  ndbout_c("NdbObjectIdMap:::NdbObjectIdMap(%u)", sz);
+#endif
+}
+
+NdbObjectIdMap::~NdbObjectIdMap()
+{
+  free(m_map);
+}
+
+int NdbObjectIdMap::expand(Uint32 incSize)
+{
+  NdbMutex_Lock(m_mutex);
+  Uint32 newSize = m_size + incSize;
+  MapEntry * tmp = (MapEntry*)realloc(m_map, newSize * sizeof(MapEntry));
+
+  if (likely(tmp != 0))
+  {
+    m_map = tmp;
+    
+    for(Uint32 i = m_size; i < newSize; i++){
+      m_map[i].m_next = i + 1;
+    }
+    m_firstFree = m_size;
+    m_map[newSize-1].m_next = InvalidId;
+    m_size = newSize;
+  }
+  else
+  {
+    NdbMutex_Unlock(m_mutex);
+    g_eventLogger.error("NdbObjectIdMap::expand: realloc(%u*%u) failed",
+                        newSize, sizeof(MapEntry));
+    return -1;
+  }
+  NdbMutex_Unlock(m_mutex);
+  return 0;
+}

ndb/src/ndbapi/ObjectMap.hpp

@@ -20,6 +20,9 @@
 //#include <NdbMutex.h>
 #include <NdbOut.hpp>
 
+#include <EventLogger.hpp>
+extern EventLogger g_eventLogger;
+
 //#define DEBUG_OBJECTMAP
 
 /**
@@ -49,24 +52,6 @@ private:
   int expand(Uint32 newSize);
 };
 
-inline
-NdbObjectIdMap::NdbObjectIdMap(NdbMutex* mutex, Uint32 sz, Uint32 eSz) {
-  m_size = 0;
-  m_firstFree = InvalidId;
-  m_map = 0;
-  m_mutex = mutex;
-  m_expandSize = eSz;
-  expand(sz);
-#ifdef DEBUG_OBJECTMAP
-  ndbout_c("NdbObjectIdMap:::NdbObjectIdMap(%u)", sz);
-#endif
-}
-
-inline
-NdbObjectIdMap::~NdbObjectIdMap(){
-  free(m_map);
-}
-
 inline
 Uint32
 NdbObjectIdMap::map(void * object){
@@ -102,7 +87,8 @@ NdbObjectIdMap::unmap(Uint32 id, void *object){
       m_map[i].m_next = m_firstFree;
       m_firstFree = i;
     } else {
-      ndbout_c("Error: NdbObjectIdMap::::unmap(%u, 0x%x) obj=0x%x", id, object, obj);
+      g_eventLogger.error("NdbObjectIdMap::unmap(%u, 0x%x) obj=0x%x",
+                          id, object, obj);
       return 0;
     }
     
@@ -128,31 +114,4 @@ NdbObjectIdMap::getObject(Uint32 id){
   }
   return 0;
 }
-
-inline int
-NdbObjectIdMap::expand(Uint32 incSize){
-  NdbMutex_Lock(m_mutex);
-  Uint32 newSize = m_size + incSize;
-  MapEntry * tmp = (MapEntry*)realloc(m_map, newSize * sizeof(MapEntry));
-
-  if (likely(tmp != 0))
-  {
-    m_map = tmp;
-    
-    for(Uint32 i = m_size; i<newSize; i++){
-      m_map[i].m_next = i + 1;
-    }
-    m_firstFree = m_size;
-    m_map[newSize-1].m_next = InvalidId;
-    m_size = newSize;
-  }
-  else
-  {
-    NdbMutex_Unlock(m_mutex);
-    return -1;
-  }
-  NdbMutex_Unlock(m_mutex);
-  return 0;
-}
-
 #endif

ndb/src/ndbapi/SignalSender.cpp

@@ -147,7 +147,10 @@ SignalSender::waitFor(Uint32 timeOutMillis, T & t)
 {
   SimpleSignal * s = t.check(m_jobBuffer);
   if(s != 0){
-    m_usedBuffer.push_back(s);
+    if (m_usedBuffer.push_back(s))
+    {
+      return 0;
+    }
     return s;
   }
   
@@ -162,7 +165,10 @@ SignalSender::waitFor(Uint32 timeOutMillis, T & t)
     
     SimpleSignal * s = t.check(m_jobBuffer);
     if(s != 0){
-      m_usedBuffer.push_back(s);
+      if (m_usedBuffer.push_back(s))
+      {
+        return 0;
+      }
       return s;
     }
     

ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -353,7 +353,7 @@ Ndb_cluster_connection_impl::set_name(const char *name)
   }
 }
 
-void
+int
 Ndb_cluster_connection_impl::init_nodes_vector(Uint32 nodeid,
 					       const ndb_mgm_configuration 
 					       &config)
@@ -402,7 +402,10 @@ Ndb_cluster_connection_impl::init_nodes_vector(Uint32 nodeid,
       break;
     }
     }
-    m_impl.m_all_nodes.push_back(Node(group,remoteNodeId));
+    if (m_impl.m_all_nodes.push_back(Node(group,remoteNodeId)))
+    {
+      DBUG_RETURN(-1);
+    }
     DBUG_PRINT("info",("saved %d %d", group,remoteNodeId));
     for (int i= m_impl.m_all_nodes.size()-2;
 	 i >= 0 && m_impl.m_all_nodes[i].group > m_impl.m_all_nodes[i+1].group;
@@ -449,7 +452,7 @@ Ndb_cluster_connection_impl::init_nodes_vector(Uint32 nodeid,
 
   do_test();
 #endif
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(0);
 }
 
 void
@@ -532,7 +535,11 @@ int Ndb_cluster_connection::connect(int no_retries, int retry_delay_in_seconds,
       break;
 
     m_impl.m_transporter_facade->start_instance(nodeId, props);
-    m_impl.init_nodes_vector(nodeId, *props);
+    if (m_impl.init_nodes_vector(nodeId, *props))
+    {
+      ndbout_c("Ndb_cluster_connection::connect: malloc failure");
+      DBUG_RETURN(-1);
+    }
 
     for(unsigned i=0;
 	i<m_impl.m_transporter_facade->get_registry()->m_transporter_interface.size();

ndb/src/ndbapi/ndb_cluster_connection_impl.hpp

@@ -68,7 +68,7 @@ private:
   };
 
   Vector<Node> m_all_nodes;
-  void init_nodes_vector(Uint32 nodeid, const ndb_mgm_configuration &config);
+  int init_nodes_vector(Uint32 nodeid, const ndb_mgm_configuration &config);
   void connect_thread();
   void set_name(const char *name);
   

ndb/tools/restore/consumer_restore.cpp

@@ -205,7 +205,7 @@ BackupRestore::table(const TableS & table){
   BaseString tmp(name);
   Vector<BaseString> split;
   if(tmp.split(split, "/") != 3){
-    err << "Invalid table name format " << name << endl;
+    err << "Invalid table name format `" << name << "`" << endl;
     return false;
   }
 
@@ -230,16 +230,17 @@ BackupRestore::table(const TableS & table){
 
     if (dict->createTable(copy) == -1) 
     {
-      err << "Create table " << table.getTableName() << " failed: "
+      err << "Create table `" << table.getTableName() << "` failed: "
 	  << dict->getNdbError() << endl;
       return false;
     }
-    info << "Successfully restored table " << table.getTableName()<< endl ;
+    info << "Successfully restored table `"
+         << table.getTableName() << "`" << endl;
   }  
   
   const NdbDictionary::Table* tab = dict->getTable(split[2].c_str());
   if(tab == 0){
-    err << "Unable to find table: " << split[2].c_str() << endl;
+    err << "Unable to find table: `" << split[2].c_str() << "`" << endl;
     return false;
   }
   const NdbDictionary::Table* null = 0;
@@ -257,12 +258,15 @@ BackupRestore::endOfTables(){
   for(size_t i = 0; i<m_indexes.size(); i++){
     NdbTableImpl & indtab = NdbTableImpl::getImpl(* m_indexes[i]);
 
-    BaseString tmp(indtab.m_primaryTable.c_str());
     Vector<BaseString> split;
-    if(tmp.split(split, "/") != 3){
-      err << "Invalid table name format " << indtab.m_primaryTable.c_str()
-	  << endl;
-      return false;
+    {
+      BaseString tmp(indtab.m_primaryTable.c_str());
+      if (tmp.split(split, "/") != 3)
+      {
+        err << "Invalid table name format `" << indtab.m_primaryTable.c_str()
+            << "`" << endl;
+        return false;
+      }
     }
     
     m_ndb->setDatabaseName(split[0].c_str());
@@ -270,39 +274,41 @@ BackupRestore::endOfTables(){
     
     const NdbDictionary::Table * prim = dict->getTable(split[2].c_str());
     if(prim == 0){
-      err << "Unable to find base table \"" << split[2].c_str() 
-	  << "\" for index "
-	  << indtab.getName() << endl;
+      err << "Unable to find base table `" << split[2].c_str() 
+	  << "` for index `"
+	  << indtab.getName() << "`" << endl;
       return false;
     }
     NdbTableImpl& base = NdbTableImpl::getImpl(*prim);
     NdbIndexImpl* idx;
-    int id;
-    char idxName[255], buf[255];
-    if(sscanf(indtab.getName(), "%[^/]/%[^/]/%d/%s",
-	      buf, buf, &id, idxName) != 4){
-      err << "Invalid index name format " << indtab.getName() << endl;
-      return false;
+    Vector<BaseString> split_idx;
+    {
+      BaseString tmp(indtab.getName());
+      if (tmp.split(split_idx, "/") != 4)
+      {
+        err << "Invalid index name format `" << indtab.getName() << "`" << endl;
+        return false;
+      }
     }
     if(NdbDictInterface::create_index_obj_from_table(&idx, &indtab, &base))
     {
-      err << "Failed to create index " << idxName
-	  << " on " << split[2].c_str() << endl;
+      err << "Failed to create index `" << split_idx[3]
+	  << "` on " << split[2].c_str() << endl;
 	return false;
     }
-    idx->setName(idxName);
+    idx->setName(split_idx[3].c_str());
     if(dict->createIndex(* idx) != 0)
     {
       delete idx;
-      err << "Failed to create index " << idxName
-	  << " on " << split[2].c_str() << endl
+      err << "Failed to create index `" << split_idx[3].c_str()
+	  << "` on `" << split[2].c_str() << "`" << endl
 	  << dict->getNdbError() << endl;
 
       return false;
     }
     delete idx;
-    info << "Successfully created index " << idxName
-	 << " on " << split[2].c_str() << endl;
+    info << "Successfully created index `" << split_idx[3].c_str()
+	 << "` on `" << split[2].c_str() << "`" << endl;
   }
   return true;
 }

ndb/tools/restore/restore_main.cpp

@@ -559,8 +559,8 @@ main(int argc, char** argv)
       for(Uint32 j= 0; j < g_consumers.size(); j++)
 	if (!g_consumers[j]->table(* table))
 	{
-	  err << "Restore: Failed to restore table: ";
-          err << table->getTableName() << " ... Exiting " << endl;
+	  err << "Restore: Failed to restore table: `";
+          err << table->getTableName() << "` ... Exiting " << endl;
 	  exitHandler(NDBT_FAILED);
         }
     }