diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-16 11:50:13 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-16 11:50:13 +0200 |
commit | f5afd23358214e374622103ca41ca1ae967f8512 (patch) | |
tree | d567e4fd9c9880fc8afc8cf79d8e03bf838f2335 /ndb | |
parent | c1a2870988dfd4fbdc93c24513cef3fdfb816a37 (diff) | |
parent | 976deafba68897f6b5610f663e7ef8035f26a51f (diff) | |
download | mariadb-git-f5afd23358214e374622103ca41ca1ae967f8512.tar.gz |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 1 | ||||
-rw-r--r-- | ndb/src/ndbapi/SignalSender.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index d40eaab7bd5..b713a3908ab 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -2408,6 +2408,7 @@ int MgmtSrvr::abortBackup(Uint32 backupId) { SignalSender ss(theFacade); + ss.lock(); // lock will be released on exit bool next; NodeId nodeId = 0; diff --git a/ndb/src/ndbapi/SignalSender.cpp b/ndb/src/ndbapi/SignalSender.cpp index a29fe68937b..0ecc98f5f29 100644 --- a/ndb/src/ndbapi/SignalSender.cpp +++ b/ndb/src/ndbapi/SignalSender.cpp @@ -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); } |