SERVER-3192 require atomic specifier to be top level

1 files changed, 5 insertions, 0 deletions

diff --git a/jstests/remove2.js b/jstests/remove2.js
index ff122a064b4..eb4ef074713 100644
--- a/jstests/remove2.js
+++ b/jstests/remove2.js
@@ -21,6 +21,11 @@ function g() {
     t.save( { x:[7,8,9], z:"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" } );
 
     t.remove( {x : {$gte:3}, $atomic:x++ } );
+    
+    assert( !db.getLastError() );
+    // $atomic within $and is not allowed.
+    t.remove( {x : {$gte:3}, $and:[{$atomic:true}] } );
+    assert( db.getLastError() );
 
     assert( t.findOne({x:3}) == null );
     assert( t.findOne({x:8}) == null );