SERVER-1529 partial fix

db/query.cpp

@@ -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();
                 }
             }
         }        

jstests/cursora.js

@@ -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()