summaryrefslogtreecommitdiff
path: root/ndb/src/kernel/main.cpp
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-08-03 14:58:44 +0200
committerunknown <joreland@mysql.com>2004-08-03 14:58:44 +0200
commitec9cd4ecc9deadb1f523c0a77207da5064242897 (patch)
tree4b0214640bf037ccf7007a8a6ad21b855132067a /ndb/src/kernel/main.cpp
parentac8b4881c1cc9a2e525686aa6d1519e15cd3f137 (diff)
downloadmariadb-git-ec9cd4ecc9deadb1f523c0a77207da5064242897.tar.gz
more 4.1 to irix merge
Diffstat (limited to 'ndb/src/kernel/main.cpp')
-rw-r--r--ndb/src/kernel/main.cpp12
1 files changed, 8 insertions, 4 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();