SERVER-6400: $ne is not its own operator anymore, $not + $eq

1 files changed, 12 insertions, 3 deletions

diff --git a/src/mongo/db/matcher/matcher.cpp b/src/mongo/db/matcher/matcher.cpp
index 94f5ef32df3..685f5d612c0 100644
--- a/src/mongo/db/matcher/matcher.cpp
+++ b/src/mongo/db/matcher/matcher.cpp
@@ -306,15 +306,24 @@ namespace mongo {
                 return newIn.release();
             }
             else if ( cmp->getRHS().type() == jstNULL ) {
-                spliceInfo->hasNullEquality = true;
+                //spliceInfo->hasNullEquality = true;
+                return NULL;
             }
         }
 
         case MatchExpression::LTE:
         case MatchExpression::LT:
         case MatchExpression::GT:
-        case MatchExpression::GTE:
-        case MatchExpression::NE:
+        case MatchExpression::GTE: {
+            const ComparisonMatchExpression* cmp =
+                static_cast<const ComparisonMatchExpression*>( full );
+
+            if ( cmp->getRHS().type() == jstNULL ) {
+                // null and indexes don't play nice
+                //spliceInfo->hasNullEquality = true;
+                return NULL;
+            }
+        }
         case MatchExpression::REGEX:
         case MatchExpression::MOD: {
             const LeafMatchExpression* lme = static_cast<const LeafMatchExpression*>( full );