0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00

Merge branch 'master' of github.com:mongodb/mongo

This commit is contained in:
Eliot Horowitz 2010-08-01 04:08:47 -04:00
commit cad51920ec
2 changed files with 3 additions and 1 deletions

View File

@ -649,6 +649,8 @@ namespace mongo {
_cc.reset();
massert( 13338, "cursor dropped during query", false );
// TODO maybe we want to prevent recording the winning plan as well?
} else {
_c->checkLocation();
}
}
}

View File

@ -11,7 +11,7 @@ function run( n ){
t.insert( { _id : i } )
db.getLastError()
join = startParallelShell( "sleep(50); db.cursora.remove( {} );" );
join = startParallelShell( "sleep(50); db.cursora.remove( {} ); db.getLastError();" );
start = new Date()
num = t.find( function(){ num = 2; for ( var x=0; x<1000; x++ ) num += 2; return num > 0; } ).sort( { _id : -1 } ).limit(n).itcount()