bzr commit into mysql-5.1 branch (jonas:2793)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/

 2793 Jonas Oreland	2008-12-12
      ndb - remoev requires makeing upgrade from 6.2 "possible"
modified:
  storage/ndb/src/kernel/vm/Configuration.cpp

=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2008-11-06 09:48:21 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2008-12-12 12:51:39 +0000
@@ -451,35 +451,27 @@ Configuration::setupConfiguration(){
 	      "TimeBetweenWatchDogCheck missing");
   }
 
-  if(iter.get(CFG_DB_SCHED_EXEC_TIME, &_schedulerExecutionTimer)){
-    ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
-	      "SchedulerExecutionTimer missing");
-  }
+  _schedulerExecutionTimer = 50;
+  iter.get(CFG_DB_SCHED_EXEC_TIME, &_schedulerExecutionTimer);
 
-  if(iter.get(CFG_DB_SCHED_SPIN_TIME, &_schedulerSpinTimer)){
-    ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
-	      "SchedulerSpinTimer missing");
-  }
+  _schedulerSpinTimer = 0;
+  iter.get(CFG_DB_SCHED_SPIN_TIME, &_schedulerSpinTimer);
 
-  if(iter.get(CFG_DB_REALTIME_SCHEDULER, &_realtimeScheduler)){
-    ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
-	      "RealtimeScheduler missing");
-  }
+  _realtimeScheduler = 0;
+  iter.get(CFG_DB_REALTIME_SCHEDULER, &_realtimeScheduler);
 
-  if(iter.get(CFG_DB_EXECUTE_LOCK_CPU, &_executeLockCPU)){
-    ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
-	      "LockExecuteThreadToCPU missing");
-  }
+  _executeLockCPU = 65535;
+  iter.get(CFG_DB_EXECUTE_LOCK_CPU, &_executeLockCPU);
 
-  if(iter.get(CFG_DB_MAINT_LOCK_CPU, &_maintLockCPU)){
-    ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
-	      "LockMaintThreadsToCPU missing");
-  }
-  if(iter.get(CFG_DB_WATCHDOG_INTERVAL_INITIAL, &_timeBetweenWatchDogCheckInitial)){
+  _maintLockCPU = 65535;
+  iter.get(CFG_DB_MAINT_LOCK_CPU, &_maintLockCPU);
+
+  if(iter.get(CFG_DB_WATCHDOG_INTERVAL_INITIAL, 
+              &_timeBetweenWatchDogCheckInitial)){
     ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
 	      "TimeBetweenWatchDogCheckInitial missing");
   }
-
+  
   /**
    * Get paths
    */  
@@ -494,14 +486,14 @@ Configuration::setupConfiguration(){
     ERROR_SET(fatal, NDBD_EXIT_INVALID_CONFIG, "Invalid configuration fetched", 
 	      "RestartOnErrorInsert missing");
   }
-
+  
   /**
    * Create the watch dog thread
    */
   { 
     if (_timeBetweenWatchDogCheckInitial < _timeBetweenWatchDogCheck)
       _timeBetweenWatchDogCheckInitial = _timeBetweenWatchDogCheck;
-
+    
     Uint32 t = _timeBetweenWatchDogCheckInitial;
     t = globalEmulatorData.theWatchDog ->setCheckInterval(t);
     _timeBetweenWatchDogCheckInitial = t;