more 4.1 to irix merge

4 files changed, 20 insertions, 12 deletions

diff --git a/ndb/src/kernel/main.cpp b/ndb/src/kernel/main.cpp
index f2896cfdd8e..f8e852b9d35 100644
--- a/ndb/src/kernel/main.cpp
+++ b/ndb/src/kernel/main.cpp
@@ -175,11 +175,15 @@ NDB_MAIN(ndb_kernel){
 
   globalTransporterRegistry.startSending();
   globalTransporterRegistry.startReceiving();
-  if (!globalTransporterRegistry.start_service(socket_server))
-    NDB_ASSERT(0, "globalTransporterRegistry.start_service() failed");
+  if (!globalTransporterRegistry.start_service(socket_server)){
+    ndbout_c("globalTransporterRegistry.start_service() failed");
+    exit(-1);
+  }
 
-  if (!globalTransporterRegistry.start_clients())
-    NDB_ASSERT(0, "globalTransporterRegistry.start_clients() failed");
+  if (!globalTransporterRegistry.start_clients()){
+    ndbout_c("globalTransporterRegistry.start_clients() failed");
+    exit(-1);
+  }
 
   globalEmulatorData.theWatchDog->doStart();
   
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 511572b31f1..ca77ae9fb63 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -587,8 +587,10 @@ MgmtSrvr::MgmtSrvr(NodeId nodeId,
       _ownNodeId= 0; // did not get nodeid requested
     }
     m_allocated_resources.reserve_node(_ownNodeId);
-  } else
-    NDB_ASSERT(0, "Unable to retrieve own node id");
+  } else {
+    ndbout_c("Unable to retrieve own node id");
+    exit(-1);
+  }
 }
 
 
diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/ndb/src/ndbapi/TransporterFacade.cpp
index a52547954a0..6a25db560c9 100644
--- a/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/ndb/src/ndbapi/TransporterFacade.cpp
@@ -463,11 +463,15 @@ void TransporterFacade::threadMainSend(void)
   SocketServer socket_server;
 
   theTransporterRegistry->startSending();
-  if (!theTransporterRegistry->start_service(socket_server))
-    NDB_ASSERT(0, "Unable to start theTransporterRegistry->start_service");
+  if (!theTransporterRegistry->start_service(socket_server)){
+    ndbout_c("Unable to start theTransporterRegistry->start_service");
+    exit(0);
+  }
 
-  if (!theTransporterRegistry->start_clients())
-    NDB_ASSERT(0, "Unable to start theTransporterRegistry->start_clients");
+  if (!theTransporterRegistry->start_clients()){
+    ndbout_c("Unable to start theTransporterRegistry->start_clients");
+    exit(0);
+  }
 
   socket_server.startServer();
 
diff --git a/ndb/test/src/HugoOperations.cpp b/ndb/test/src/HugoOperations.cpp
index 821cd8ad1e0..d5dbf1388d1 100644
--- a/ndb/test/src/HugoOperations.cpp
+++ b/ndb/test/src/HugoOperations.cpp
@@ -703,5 +703,3 @@ HugoOperations::indexUpdateRecord(Ndb*,
   }
   return NDBT_OK;
 }
-
-template class Vector<HugoOperations::ScanTmp>;