Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2042 06/01/12 16:59:27 jonas@stripped +1 -0
Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.85 06/01/12 16:59:23 jonas@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jonas
# Host: perch.ndb.mysql.com
# Root: /home/jonas/src/51-ndb/RESYNC
--- 1.84/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-01-12 10:11:54 +01:00
+++ 1.85/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-01-12 16:59:23 +01:00
@@ -771,10 +771,14 @@
jam();
if (NodeBitmask::get(readNodes->allNodes, i)) {
jam();
- m_sr_nodes.set(i);
cnodeData[ind] = i;
cnodeStatus[ind] = NodeBitmask::get(readNodes->inactiveNodes, i);
//readNodes->getVersionId(i, readNodes->theVersionIds) not used
+ if (!NodeBitmask::get(readNodes->inactiveNodes, i))
+ {
+ jam();
+ m_sr_nodes.set(i);
+ }
ind++;
}//if
}//for

Content reproduced on this site is the property of the respective copyright holders. It is not reviewed in advance by Oracle and does not necessarily represent the opinion of Oracle or any other party.