Commit 0f404366 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge
parents 7cb13aec f5afd233

storage/ndb/src/mgmsrv/MgmtSrvr.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2514,6 +2514,7 @@ int 
MgmtSrvr::abortBackup(Uint32 backupId)

{

  SignalSender ss(theFacade);

  ss.lock(); // lock will be released on exit



  bool next;

  NodeId nodeId = 0;

storage/ndb/src/ndbapi/SignalSender.cpp

+2 −0
Original line number Diff line number Diff line
@@ -75,7 +75,9 @@ SignalSender::SignalSender(TransporterFacade *facade) 
{

  m_cond = NdbCondition_Create();

  theFacade = facade;

  lock();

  m_blockNo = theFacade->open(this, execSignal, execNodeStatus);

  unlock();

  assert(m_blockNo > 0);

}