bzr push into mysql-5.1 branch (jonas:2735 to 2736)

[Jonas Oreland]

 2736 Jonas Oreland	2008-11-07
      ndb - remove incorrect assertions
modified:
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

 2735 Magnus Svensson	2008-11-07 [merge]
      Merge
modified:
  BUILD/SETUP.sh
  mysql-test/suite/ndb/t/ndb_dbug_lock.test
  storage/ndb/src/common/debugger/EventLogger.cpp
  storage/ndb/src/cw/cpcd/Process.cpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
  storage/ndb/src/mgmsrv/Services.cpp
  storage/ndb/src/ndbapi/ObjectMap.cpp
  support-files/compiler_warnings.supp

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2008-10-28 10:57:58 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2008-11-07 14:43:14 +0000
@@ -2928,7 +2928,6 @@ void Dbdih::execUPDATE_TOREQ(Signal* sig
   return;
 
 ref:
-  ndbassert(false);
   UpdateToRef* ref = (UpdateToRef*)signal->getDataPtrSend();
   ref->senderData = req.senderData;
   ref->senderRef = reference();
@@ -3834,8 +3833,6 @@ Dbdih::execUPDATE_TOREF(Signal* signal)
   UpdateToRef* ref = (UpdateToRef*)signal->getDataPtr();
   Uint32 errCode = ref->errorCode;
 
-  ndbassert(false);
-
   TakeOverRecordPtr takeOverPtr;
   c_takeOverPool.getPtr(takeOverPtr, ref->senderData);