#At file:///home/jonas/src/70-spj-svs/ based on revid:jonas@stripped
3433 jonas oreland 2011-02-12
ndb spj - handle TO during SR
modified:
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp 2011-02-11 13:32:02 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp 2011-02-12 10:15:53 +0000
@@ -234,7 +234,7 @@ Dbspj::execREAD_NODESCONF(Signal* signal
c_alive_nodes.assign(NdbNodeBitmask::Size, conf->startingNodes);
NdbNodeBitmask tmp;
tmp.assign(NdbNodeBitmask::Size, conf->startedNodes);
- ndbrequire(tmp.isclear()); // No nodes can be started during SR
+ c_alive_nodes.bitOR(tmp);
}
sendSTTORRY(signal);
Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20110212101553-fywr34hhwsxr2jym.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3433) | jonas oreland | 12 Feb |