List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 6 2009 1:50pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:3082)
View as plain text  
 3082 Jonas Oreland	2009-10-06 [merge]
      merge 70-main

    removed:
      mysys/mf_strip.c
    modified:
      include/my_sys.h
      mysql-test/suite/ndb/t/ndb_restore_compressed.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      sql/mysql_priv.h.pp
      storage/ndb/test/ndbapi/testMgmd.cpp
=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2009-09-21 08:42:40 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2009-10-06 13:44:23 +0000
@@ -3694,9 +3694,9 @@ void Qmgr::handleApiCloseComConf(Signal*
   CloseComReqConf * const closeCom = (CloseComReqConf *)&signal->theData[0];
 
   /* Api failure special case */
-  for(Uint32 nodeId = 0; nodeId < MAX_NDB_NODES; nodeId ++)
+  for(Uint32 nodeId = 0; nodeId < MAX_NODES; nodeId ++)
   {
-    if(NdbNodeBitmask::get(closeCom->theNodes, nodeId))
+    if (NodeBitmask::get(closeCom->theNodes, nodeId))
     {
       jam();
       /* Check that *only* 1 *API* node is included in
@@ -3704,8 +3704,8 @@ void Qmgr::handleApiCloseComConf(Signal*
        */
       ndbrequire(getNodeInfo(nodeId).getType() != NodeInfo::DB);
       ndbrequire(closeCom->noOfNodes == 1);
-      NdbNodeBitmask::clear(closeCom->theNodes, nodeId);
-      ndbrequire(NdbNodeBitmask::isclear(closeCom->theNodes));
+      NodeBitmask::clear(closeCom->theNodes, nodeId);
+      ndbrequire(NodeBitmask::isclear(closeCom->theNodes));
       
       /* Now that we know communication from the failed Api has
        * ceased, we can send the required API_FAILREQ signals


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20091006135027-yf8a3g3vjuid1u14.bundle
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:3082)Jonas Oreland6 Oct