bk commit into 4.1 tree (tomas:1.2406) BUG#12043

[tomas]

Below is the list of changes that have just been committed into a local
4.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.2406 05/09/01 00:13:01 tomas@stripped +1 -0
  Bug #12043, do not core on misconfig unless debug compiled

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.60 05/09/01 00:12:58 tomas@stripped +15 -5
    Bug #12043, do not core on misconfig unless debug compiled

# 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/mysql-4.1

--- 1.59/ndb/src/mgmsrv/ConfigInfo.cpp	2005-07-25 12:42:28 +02:00
+++ 1.60/ndb/src/mgmsrv/ConfigInfo.cpp	2005-09-01 00:12:58 +02:00
@@ -2136,7 +2136,17 @@
 /****************************************************************************
  * 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 @@
  ****************************************************************************/
 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 @@
     }
     case PropertiesType_Properties:
     default:
-      abort();
+      ::require(false);
     }
   }
   return true;
@@ -3406,7 +3416,7 @@
 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 @@
 	break;
       }
       default:
-	abort();
+	require(false);
       }
       require(ok);
     }