SERVER-6400: inprog has a $all option which isn't valid syntax, so re-write without

1 files changed, 14 insertions, 1 deletions

diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index efd8a7bb877..75c90ad4c2d 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -138,9 +138,22 @@ namespace mongo {
             bool all = q.query["$all"].trueValue();
             vector<BSONObj> vals;
             {
+                BSONObj filter;
+                {
+                    BSONObjBuilder b;
+                    BSONObjIterator i( q.query );
+                    while ( i.more() ) {
+                        BSONElement e = i.next();
+                        if ( str::equals( "$all", e.fieldName() ) )
+                            continue;
+                        b.append( e );
+                    }
+                    filter = b.obj();
+                }
+
                 Client& me = cc();
                 scoped_lock bl(Client::clientsMutex);
-                scoped_ptr<Matcher> m(new Matcher(q.query));
+                scoped_ptr<Matcher> m(new Matcher(filter));
                 for( set<Client*>::iterator i = Client::clients.begin(); i != Client::clients.end(); i++ ) {
                     Client *c = *i;
                     verify( c );