Merge branch 'bugfixes/tokumx-2.0' into releases/tokumx-2.0

Tokutek · Sep 30, 2014 · 894dfe2 · 894dfe2
2 parents 5a368b6 + d53e652
commit 894dfe2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/mongo/db/storage/env.cpp b/src/mongo/db/storage/env.cpp
@@ -116,7 +116,8 @@ namespace mongo {
                 const BSONObj updateObj = msg["o"].Obj();
                 BSONElement queryElement = msg["q"];
                 const BSONObj query = queryElement.ok() ? queryElement.Obj() : BSONObj();
-                const uint32_t fastUpdateFlags = msg["f"].Int();
+                BSONElement flagsElement = msg["f"];
+                const uint32_t fastUpdateFlags = flagsElement.ok() ? flagsElement.Int() : 0;
                 runUpdateMods(db, key, old_val, updateObj, query, fastUpdateFlags, set_val, set_extra);
                 return 0;
             } catch (const std::exception &ex) {