xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Aaron
2011-06-09 12:51:35 -04:00
parent 19e4da3975
commit 5369770ecc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/queryoptimizercursor.cpp
View File

@@ -158,7 +158,7 @@ namespace mongo {
}
virtual DiskLoc currLoc() { return _takeover ? _takeover->currLoc() : _currLoc(); }
DiskLoc _currLoc() const {
verify( 14820, !_takeover );
verify( 14826, !_takeover );
if ( _currOp ) {
return _currOp->currLoc();
}
@@ -208,7 +208,7 @@ namespace mongo {
virtual bool supportGetMore() { return false; }
virtual bool supportYields() { return _takeover ? _takeover->supportsYield() : true; }
virtual bool supportYields() { return _takeover ? _takeover->supportYields() : true; }
virtual bool prepareToYield() {
if ( _takeover ) {
return _takeover->prepareToYield();