From e0f3c5c0fb936fd0ebeee54c07ae16265e9537b9 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Thu, 1 Sep 2005 00:13:01 +0200
Subject: Bug #12043, do not core on misconfig unless debug compiled

---
 ndb/src/mgmsrv/ConfigInfo.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'ndb')

diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index bc078b711dc..cface035174 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -2136,7 +2136,17 @@ const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo);
 /****************************************************************************
  * Ctor
  ****************************************************************************/
-static void require(bool v) { if(!v) abort();}
+static void require(bool v)
+{
+  if(!v)
+  {
+#ifndef DBUG_OFF
+    abort();
+#else
+    exit(-1);
+#endif
+  }
+}
 
 ConfigInfo::ConfigInfo()
   : m_info(true), m_systemDefaults(true)
@@ -2277,7 +2287,7 @@ ConfigInfo::ConfigInfo()
  ****************************************************************************/
 inline void warning(const char * src, const char * arg){
   ndbout << "Illegal call to ConfigInfo::" << src << "() - " << arg << endl;
-  abort();
+  require(false);
 }
 
 const Properties * 
@@ -3394,7 +3404,7 @@ fixDepricated(InitConfigFileParser::Context & ctx, const char * data){
     }
     case PropertiesType_Properties:
     default:
-      abort();
+      ::require(false);
     }
   }
   return true;
@@ -3406,7 +3416,7 @@ static bool
 saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
   const Properties * sec;
   if(!ctx.m_currentInfo->get(ctx.fname, &sec)){
-    abort();
+    require(false);
     return false;
   }
   
@@ -3477,7 +3487,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
 	break;
       }
       default:
-	abort();
+	require(false);
       }
       require(ok);
     }
-- 
cgit v1.2.1