bzr push into mysql-5.1 branch (jonas:3058 to 3059)

[Jonas Oreland]

 3059 Jonas Oreland	2008-11-07
      ndb - rt - fix weird init
modified:
  storage/ndb/src/kernel/vm/Configuration.cpp

 3058 Magnus Svensson	2008-11-07 [merge]
      Merge
modified:
  storage/ndb/include/kernel/signaldata/DictLock.hpp
  storage/ndb/include/ndb_version.h.in
  storage/ndb/src/common/util/Bitmask.cpp
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.hpp
  storage/ndb/src/kernel/main.cpp
  storage/ndb/src/kernel/vm/Configuration.cpp
  storage/ndb/src/kernel/vm/Configuration.hpp
  storage/ndb/src/kernel/vm/ThreadConfig.cpp
  storage/ndb/src/kernel/vm/ThreadConfig.hpp
  storage/ndb/src/kernel/vm/mt.cpp
  storage/ndb/src/mgmsrv/ConfigInfo.cpp

=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2008-11-07 13:23:15 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2008-11-07 19:50:20 +0000
@@ -1094,6 +1094,7 @@ Configuration::setLockCPU(NdbThread * pT
                           bool exec_thread,
                           bool init)
 {
+  (void)init;
   Uint32 cpu_id;
   int tid = NdbThread_GetTid(pThread);
   if (tid == -1)
@@ -1111,8 +1112,8 @@ Configuration::setLockCPU(NdbThread * pT
     cpu_id = executeLockCPU();
   else
     cpu_id = _maintLockCPU;
-  if (!init ||
-      cpu_id != NO_LOCK_CPU)
+
+  if (cpu_id != NO_LOCK_CPU)
   {
     int error_no;
     ndbout << "Lock threadId = " << tid;