Merge with verify changes.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/queryoptimizer.cpp b/src/mongo/db/queryoptimizer.cpp
index bab670342de..54e9fcb668b 100644
--- a/src/mongo/db/queryoptimizer.cpp
+++ b/src/mongo/db/queryoptimizer.cpp
@@ -322,7 +322,7 @@ doneCheckOrder:
             !_parsedQuery->wantMore() &&
             !isMultiKey() &&
             queryFiniteSetOrderSuffix() ) {
-            verify( 16111, _direction == 0 );
+            verify( _direction == 0 );
             // Limit the results for each compound interval. SERVER-5063
             return _parsedQuery->getSkip() + _parsedQuery->getNumToReturn();
         }
diff --git a/src/mongo/db/queryutil-inl.h b/src/mongo/db/queryutil-inl.h
index 1df6ea8728d..1fbcd05ca31 100644
--- a/src/mongo/db/queryutil-inl.h
+++ b/src/mongo/db/queryutil-inl.h
@@ -80,7 +80,7 @@ namespace mongo {
             unsigned long long product =
                     (unsigned long long)ret * (unsigned long long)i->intervals().size();
             // Check for overflow SERVER-5415.
-            verify( 16110, ( product >> 32 ) == 0 );
+            verify( ( product >> 32 ) == 0 );
             ret = product;
         }
         return ret;